diff --git a/buildSrc/src/main/java/TinkLinkVersion.kt b/buildSrc/src/main/java/TinkLinkVersion.kt
index c4c29c76b..d04f267f9 100644
--- a/buildSrc/src/main/java/TinkLinkVersion.kt
+++ b/buildSrc/src/main/java/TinkLinkVersion.kt
@@ -2,7 +2,7 @@ object TinkLinkVersion {
 
     private const val major = 0
     private const val minor = 14
-    private const val patch = 2
+    private const val patch = 3
 
     const val name = "$major.$minor.$patch"
 
diff --git a/link-ui/src/main/java/com/tink/link/ui/credentials/ConsentViewModel.kt b/link-ui/src/main/java/com/tink/link/ui/credentials/ConsentViewModel.kt
index d9ced3d04..43df545fb 100644
--- a/link-ui/src/main/java/com/tink/link/ui/credentials/ConsentViewModel.kt
+++ b/link-ui/src/main/java/com/tink/link/ui/credentials/ConsentViewModel.kt
@@ -20,6 +20,7 @@ internal class ConsentViewModel() : ViewModel() {
     val privacyPolicyUrl = consentContext.privacyPolicy()
 
     private val _clientDescription = MutableLiveData<OAuthClientDescription>()
+    val clientDescription: LiveData<OAuthClientDescription> = _clientDescription
 
     val scopeDescriptions: MutableList<ScopeDescription> = mutableListOf()
 
@@ -40,14 +41,9 @@ internal class ConsentViewModel() : ViewModel() {
     val isUnverified: LiveData<Boolean> =
         Transformations.map(_clientDescription) { it?.verified == false }
 
-    val showConsentInformation: LiveData<Boolean> =
-        Transformations.map(_clientDescription) { it?.aggregator == false }
-
-    val clientName: LiveData<String> = Transformations.map(_clientDescription) { it?.clientName }
-
     val showTinkLogo: LiveData<Boolean> =
         Transformations.map(_clientDescription) { it?.aggregator == false }
 
-    val showTermsAndConditions: LiveData<Boolean> =
-        Transformations.map(_clientDescription) { it?.aggregator == false }
+    fun showTermsAndConsent(clientDescription: OAuthClientDescription) =
+        !clientDescription.aggregator
 }
diff --git a/link-ui/src/main/java/com/tink/link/ui/credentials/CredentialsField.kt b/link-ui/src/main/java/com/tink/link/ui/credentials/CredentialsField.kt
index 51a191770..525163adc 100644
--- a/link-ui/src/main/java/com/tink/link/ui/credentials/CredentialsField.kt
+++ b/link-ui/src/main/java/com/tink/link/ui/credentials/CredentialsField.kt
@@ -69,7 +69,27 @@ internal class MutableCredentialsField : LinearLayout, CredentialsField {
         getFilledField().validate()
             .also {
                 textInputLayout.error =
-                    if (it is Field.ValidationResult.ValidationError) it.errorMessage else null
+                    if (it is Field.ValidationResult.ValidationError) {
+                        when (it) {
+                            is Field.ValidationResult.ValidationError.Invalid -> {
+                                it.errorMessage
+                            }
+
+                            is Field.ValidationResult.ValidationError.MaxLengthLimit -> {
+                                context.getString(
+                                    R.string.tink_credentials_field_validation_error_maxLengthLimit,
+                                    field.validationRules.maxLength
+                                )
+                            }
+
+                            is Field.ValidationResult.ValidationError.MinLengthLimit -> {
+                                context.getString(
+                                    R.string.tink_credentials_field_validation_error_minLengthLimit,
+                                    field.validationRules.minLength
+                                )
+                            }
+                        }
+                    } else null
             }
             .let { it == Field.ValidationResult.Valid }
 
diff --git a/link-ui/src/main/java/com/tink/link/ui/credentials/CredentialsFragment.kt b/link-ui/src/main/java/com/tink/link/ui/credentials/CredentialsFragment.kt
index 29f0befb3..d3c6439ca 100644
--- a/link-ui/src/main/java/com/tink/link/ui/credentials/CredentialsFragment.kt
+++ b/link-ui/src/main/java/com/tink/link/ui/credentials/CredentialsFragment.kt
@@ -24,9 +24,9 @@ import com.tink.link.authentication.AuthenticationTask.ThirdPartyAuthentication.
 import com.tink.link.ui.R
 import com.tink.link.ui.TinkLinkUiActivity
 import com.tink.link.ui.extensions.LinkInfo
-import com.tink.link.ui.extensions.convertCallToActionText
 import com.tink.link.ui.extensions.hideKeyboard
 import com.tink.link.ui.extensions.setTextWithLinks
+import com.tink.link.ui.extensions.setTextWithUrlMarkdown
 import com.tink.link.ui.extensions.toArrayList
 import com.tink.link.ui.extensions.toView
 import com.tink.model.credentials.Credentials
@@ -34,9 +34,9 @@ import com.tink.model.provider.Provider
 import kotlinx.android.parcel.Parcelize
 import kotlinx.android.synthetic.main.tink_fragment_credentials.*
 import kotlinx.android.synthetic.main.tink_fragment_credentials.authenticateCredentialsLayout
-import kotlinx.android.synthetic.main.tink_layout_consent.*
 import kotlinx.android.synthetic.main.tink_layout_credentials_authenticate.*
-import kotlinx.android.synthetic.main.tink_layout_toolbar.toolbar
+import kotlinx.android.synthetic.main.tink_layout_toolbar_with_logo.*
+import kotlinx.android.synthetic.main.tink_layout_toolbar_with_logo.view.*
 
 private const val BANK_ID_ACTION_SAME_DEVICE = 1
 private const val BANK_ID_ACTION_OTHER_DEVICE = 2
@@ -66,13 +66,17 @@ internal class CredentialsFragment : Fragment(R.layout.tink_fragment_credentials
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        toolbar.title = getString(R.string.tink_credentials_authentication_title)
-        toolbar.setNavigationOnClickListener {
+        toolbarWithLogo.toolbarTitleView.text = provider.displayName
+        toolbarWithLogo.setNavigationOnClickListener {
             (activity as? TinkLinkUiActivity)?.closeTinkLinkUi(
                 TinkLinkUiActivity.RESULT_CANCELLED
             )
         }
 
+        provider.images?.icon?.let {
+            Picasso.get().load(it).into(toolbarWithLogo.logoView)
+        }
+
         when (credentialsOperationArgs) {
             is CredentialsOperationArgs.Create,
             is CredentialsOperationArgs.Update -> { showFullCredentialsFlow() }
@@ -143,20 +147,13 @@ internal class CredentialsFragment : Fragment(R.layout.tink_fragment_credentials
         authenticateCredentialsLayout.visibility = View.GONE
         addCredentialsLayout.visibility = View.VISIBLE
         consentViewModel.apply {
-            showConsentInformation.observe(viewLifecycleOwner) {
-                userGroup.visibility = if (it == true) View.VISIBLE else View.GONE
-            }
-            clientName.observe(viewLifecycleOwner) {
-                setConsentInformation(it)
-            }
-            showTermsAndConditions.observe(viewLifecycleOwner) {
-                termsAndConditionsText.visibility =
-                    if (it == true) {
-                        setTermsAndConditions(termsAndConditionsUrl, privacyPolicyUrl)
-                        View.VISIBLE
-                    } else {
-                        View.GONE
-                    }
+            clientDescription.observe(viewLifecycleOwner) {
+                if (showTermsAndConsent(it)) {
+                    termsAndConsentText.visibility = View.VISIBLE
+                    setTermsAndConsentText(termsAndConditionsUrl, privacyPolicyUrl, it.clientName)
+                } else {
+                    termsAndConsentText.visibility = View.GONE
+                }
             }
             isUnverified.observe(viewLifecycleOwner) {
                 unverifiedWarning.visibility =
@@ -167,12 +164,13 @@ internal class CredentialsFragment : Fragment(R.layout.tink_fragment_credentials
             }
         }
 
-        provider.images?.icon?.let {
-            Picasso.get().load(it).into(logo)
+        if (provider.fields.isEmpty()) {
+            showEmptyFieldsFlow()
+        } else {
+            emptyFieldsGroup.isVisible = false
+            credentialsFieldsHelpTextGroup.isVisible = true
         }
 
-        bankName.text = provider.displayName
-
         val fields = provider.fields.map { field ->
             credentialsOperationArgs
                 .takeIf { it is CredentialsOperationArgs.Update }
@@ -209,6 +207,14 @@ internal class CredentialsFragment : Fragment(R.layout.tink_fragment_credentials
             submitFilledFields()
         }
 
+        if (provider.helpText.isNotBlank()) {
+            providerHelpText.visibility = View.VISIBLE
+            providerHelpText.setTextWithUrlMarkdown(provider.helpText)
+            providerHelpText.movementMethod = LinkMovementMethod.getInstance()
+        } else {
+            providerHelpText.visibility = View.GONE
+        }
+
         createCredentialsBtn.setOnClickListener { submitFilledFields() }
 
         footer.post {
@@ -218,6 +224,16 @@ internal class CredentialsFragment : Fragment(R.layout.tink_fragment_credentials
         }
     }
 
+    private fun showEmptyFieldsFlow() {
+        credentialsFieldsHelpTextGroup.isVisible = false
+        emptyFieldsGroup.isVisible = true
+        provider.images?.icon?.let {
+            Picasso.get().load(it).into(emptyFieldsBankLogo)
+        }
+        emptyFieldsLoginText.text =
+            getString(R.string.tink_credentials_empty_fields_login, provider.displayName)
+    }
+
     private fun showAuthenticateFlow() {
         addCredentialsLayout.visibility = View.GONE
         authenticateCredentialsLayout.visibility = View.VISIBLE
@@ -258,41 +274,49 @@ internal class CredentialsFragment : Fragment(R.layout.tink_fragment_credentials
         }
     }
 
-    private fun setConsentInformation(clientName: String) {
+    private fun setTermsAndConsentText(
+        termsAndConditionsUrl: Uri,
+        privacyPolicyUrl: Uri,
+        clientName: String?
+    ) {
+        val links = mutableListOf<LinkInfo>(
+            LinkInfo.Url(
+                getString(R.string.tink_credentials_terms_and_conditions),
+                termsAndConditionsUrl.toString()
+            ),
+            LinkInfo.Url(
+                getString(R.string.tink_credentials_privacy_policy),
+                privacyPolicyUrl.toString(),
+            )
+        )
         val readMoreText = getString(R.string.tink_credentials_consent_information_read_more)
-        consentInformation.text =
-            getString(
+        var consentText = ""
+        // Add consent text if client name is not null
+        if (clientName != null) {
+            consentText = getString(
                 R.string.tink_credentials_consent_information_text,
                 clientName,
-                readMoreText
-            ).convertCallToActionText(
-                ctaText = readMoreText,
-                action = { showConsentInformation() },
-                context = requireContext()
+                getString(R.string.tink_credentials_consent_information_read_more)
             )
-        consentInformation.movementMethod = LinkMovementMethod.getInstance()
-    }
-
-    private fun setTermsAndConditions(termsAndConditionsUrl: Uri, privacyPolicyUrl: Uri) {
+            // Add CTA text to list of links to be shown in the final text
+            links.add(
+                LinkInfo.CallToAction(
+                    displayText = readMoreText,
+                    action = { showConsentInformation() }
+                )
+            )
+        }
         val termsText = getString(
             R.string.tink_credentials_terms_text,
             getString(R.string.tink_credentials_terms_and_conditions),
-            getString(R.string.tink_credentials_privacy_policy)
+            getString(R.string.tink_credentials_privacy_policy),
+            consentText
         )
-        termsAndConditionsText.setTextWithLinks(
+        termsAndConsentText.setTextWithLinks(
             fullText = termsText,
-            links = listOf(
-                LinkInfo(
-                    termsAndConditionsUrl.toString(),
-                    getString(R.string.tink_credentials_terms_and_conditions)
-                ),
-                LinkInfo(
-                    privacyPolicyUrl.toString(),
-                    getString(R.string.tink_credentials_privacy_policy)
-                )
-            )
+            links = links
         )
-        termsAndConditionsText.movementMethod = LinkMovementMethod.getInstance()
+        termsAndConsentText.movementMethod = LinkMovementMethod.getInstance()
     }
 
     private fun showConsentInformation() {
diff --git a/link-ui/src/main/java/com/tink/link/ui/extensions/StringExtensions.kt b/link-ui/src/main/java/com/tink/link/ui/extensions/StringExtensions.kt
index 050cff665..50ba43a32 100644
--- a/link-ui/src/main/java/com/tink/link/ui/extensions/StringExtensions.kt
+++ b/link-ui/src/main/java/com/tink/link/ui/extensions/StringExtensions.kt
@@ -16,35 +16,30 @@ import androidx.core.content.res.ResourcesCompat
 import com.tink.link.ui.R
 import java.util.regex.Pattern
 
-internal fun String.convertCallToActionText(
-    ctaText: String,
-    action: () -> Unit,
-    context: Context
-): CharSequence {
-    val startIndex = indexOf(ctaText)
-    val spannableString = SpannableString.valueOf(this)
-        .apply {
-            setSpan(
-                TinkCallToActionSpan(context, action),
-                startIndex,
-                startIndex + ctaText.length,
-                Spanned.SPAN_EXCLUSIVE_EXCLUSIVE
-            )
-        }
-    return SpannedString(spannableString)
-}
-
 internal fun TextView.setTextWithLinks(fullText: String, links: List<LinkInfo>) {
     val spannableString = SpannableString.valueOf(fullText)
         .apply {
             for (link in links) {
-                val startIndex = indexOf(link.linkText)
-                setSpan(
-                    TinkUrlSpan(link.url, context),
-                    startIndex,
-                    startIndex + link.linkText.length,
-                    Spanned.SPAN_EXCLUSIVE_EXCLUSIVE
-                )
+                val startIndex = indexOf(link.displayText)
+                when (link) {
+                    is LinkInfo.Url -> {
+                        setSpan(
+                            TinkUrlSpan(link.url, context),
+                            startIndex,
+                            startIndex + link.displayText.length,
+                            Spanned.SPAN_EXCLUSIVE_EXCLUSIVE
+                        )
+                    }
+
+                    is LinkInfo.CallToAction -> {
+                        setSpan(
+                            TinkCallToActionSpan(context, link.action),
+                            startIndex,
+                            startIndex + link.displayText.length,
+                            Spanned.SPAN_EXCLUSIVE_EXCLUSIVE
+                        )
+                    }
+                }
             }
         }
     text = SpannedString(spannableString)
@@ -61,13 +56,13 @@ internal fun String.convertUrlMarkdownToSpan(context: Context): SpannableString
         val url = matcher.toMatchResult().group(2)
         val startIndex = matcher.start(1) - 1
         if (!url.isNullOrEmpty() && !linkText.isNullOrEmpty()) {
-            val linkInfo = LinkInfo(url, linkText)
+            val linkInfo = LinkInfo.Url(url, linkText)
             val fullText = matcher.replaceAll(linkText)
             return SpannableString.valueOf(fullText).apply {
                 setSpan(
                     TinkUrlSpan(linkInfo.url, context),
                     startIndex,
-                    startIndex + linkInfo.linkText.length,
+                    startIndex + linkInfo.displayText.length,
                     Spanned.SPAN_EXCLUSIVE_EXCLUSIVE
                 )
             }
@@ -112,4 +107,11 @@ internal class TinkUrlSpan(url: String, val context: Context) : URLSpan(url) {
     }
 }
 
-internal data class LinkInfo(val url: String, val linkText: String)
+internal sealed class LinkInfo {
+
+    abstract val displayText: String
+
+    data class Url(override val displayText: String, val url: String) : LinkInfo()
+
+    data class CallToAction(override val displayText: String, val action: () -> Unit) : LinkInfo()
+}
diff --git a/link-ui/src/main/res/drawable/tink_logo.xml b/link-ui/src/main/res/drawable/tink_logo.xml
index 6d15782ee..f3e2a0b8a 100644
--- a/link-ui/src/main/res/drawable/tink_logo.xml
+++ b/link-ui/src/main/res/drawable/tink_logo.xml
@@ -10,36 +10,36 @@
         android:pathData="M4.2883,12.4665C3.2687,12.4665 2.9241,11.9752 2.9241,11.2595V8.0856H5.1583V6.6248H2.9241V4.0781H1.1997V6.6248H0V8.1004H1.0948V11.3037C1.0948,12.9275 2.159,14.0002 4.0181,14.0002C4.5428,14.0002 5.008,13.911 5.2625,13.8062L5.2021,12.3011C4.9179,12.4215 4.618,12.4665 4.2883,12.4665Z"
         android:strokeAlpha="0.2"
         android:fillColor="#262626"
-        android:fillAlpha="0.2"/>
+        android:fillAlpha="0.5"/>
     <path
         android:pathData="M8.1575,6.6245H6.3281V13.9254H8.1575V6.6245Z"
         android:strokeAlpha="0.2"
         android:fillColor="#262626"
-        android:fillAlpha="0.2"/>
+        android:fillAlpha="0.5"/>
     <path
         android:pathData="M13.4517,6.5508C12.342,6.5508 11.5777,7.0126 11.1431,7.6833L11.0828,6.6253H9.3286V13.9262H11.158V9.7836C11.158,8.7854 11.8024,8.1148 12.7923,8.1148C13.7218,8.1148 14.2019,8.7257 14.2019,9.7542V13.9262H16.0461V9.3365C16.0461,7.653 15.086,6.5508 13.4517,6.5508Z"
         android:strokeAlpha="0.2"
         android:fillColor="#262626"
-        android:fillAlpha="0.2"/>
+        android:fillAlpha="0.5"/>
     <path
         android:pathData="M21.2083,9.6493L23.9515,6.6244H21.7628L18.989,9.7836V4.0786H17.1597V13.9262H18.989V12.0788L20.0384,10.9316L22.1528,13.9262H24.2366L21.2083,9.6493Z"
         android:strokeAlpha="0.2"
         android:fillColor="#262626"
-        android:fillAlpha="0.2"/>
+        android:fillAlpha="0.5"/>
     <path
         android:pathData="M8.1575,4.0786H6.3281V5.6852H8.1575V4.0786Z"
         android:strokeAlpha="0.2"
         android:fillColor="#262626"
-        android:fillAlpha="0.2"/>
+        android:fillAlpha="0.5"/>
     <path
         android:pathData="M24.8218,2.2658C26.0843,2.2658 27.108,1.2512 27.108,0H28.9374C28.9374,2.2527 27.0948,4.0779 24.8226,4.0779V2.2658H24.8218Z"
         android:strokeAlpha="0.2"
         android:fillColor="#262626"
-        android:fillAlpha="0.2"/>
+        android:fillAlpha="0.5"/>
     <path
         android:pathData="M30.9483,4.0789C29.6857,4.0789 28.662,5.0935 28.662,6.3447C28.662,7.5959 29.6857,8.6104 30.9483,8.6104V10.4234C28.6752,10.4234 26.8335,8.5973 26.8335,6.3455C26.8335,4.0936 28.6761,2.2676 30.9483,2.2676V4.0789Z"
         android:strokeAlpha="0.2"
         android:fillColor="#262626"
-        android:fillAlpha="0.2"/>
+        android:fillAlpha="0.5"/>
   </group>
 </vector>
diff --git a/link-ui/src/main/res/layout/tink_fragment_credentials.xml b/link-ui/src/main/res/layout/tink_fragment_credentials.xml
index 554d35622..bf3e177f9 100644
--- a/link-ui/src/main/res/layout/tink_fragment_credentials.xml
+++ b/link-ui/src/main/res/layout/tink_fragment_credentials.xml
@@ -9,14 +9,13 @@
   android:orientation="vertical">
 
   <include
-    android:id="@+id/toolbar"
-    layout="@layout/tink_layout_toolbar" />
+      layout="@layout/tink_layout_toolbar_with_logo" />
 
   <FrameLayout
     android:id="@+id/addCredentialsLayout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:layout_below="@id/toolbar">
+    android:layout_below="@id/toolbarWithLogo">
 
     <androidx.core.widget.NestedScrollView
       android:id="@+id/scrollableContainer"
@@ -27,19 +26,25 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <include
-          android:id="@+id/consent"
-          layout="@layout/tink_layout_consent"
-          android:layout_width="match_parent"
-          android:layout_height="wrap_content" />
+        <ImageView
+            android:id="@+id/tinkLogo"
+            android:layout_width="40dp"
+            android:layout_height="20dp"
+            android:layout_marginEnd="16dp"
+            android:layout_marginTop="20dp"
+            android:background="@drawable/tink_logo"
+            android:backgroundTint="?tink_textColorSecondary"
+            android:visibility="gone"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
 
         <com.google.android.material.textview.MaterialTextView
           android:id="@+id/unverifiedWarning"
-          style="@style/tink_micro"
+          android:textAppearance="@style/tink_micro"
           android:layout_width="0dp"
           android:layout_height="wrap_content"
           android:layout_marginStart="16dp"
-          android:layout_marginTop="32dp"
+          android:layout_marginTop="20dp"
           android:layout_marginEnd="16dp"
           android:background="@drawable/tink_unverified_background"
           android:padding="12dp"
@@ -48,14 +53,14 @@
           android:visibility="gone"
           app:layout_constraintEnd_toEndOf="parent"
           app:layout_constraintStart_toStartOf="parent"
-          app:layout_constraintTop_toBottomOf="@id/consent" />
+          app:layout_constraintTop_toBottomOf="@id/tinkLogo" />
 
         <LinearLayout
           android:id="@+id/credentialsFields"
           android:layout_width="0dp"
           android:layout_height="wrap_content"
           android:layout_marginStart="16dp"
-          android:layout_marginTop="32dp"
+          android:layout_marginTop="20dp"
           android:layout_marginEnd="16dp"
           android:orientation="vertical"
           app:layout_goneMarginTop="0dp"
@@ -63,11 +68,55 @@
           app:layout_constraintStart_toStartOf="parent"
           app:layout_constraintTop_toBottomOf="@id/unverifiedWarning" />
 
+        <com.google.android.material.textview.MaterialTextView
+          android:id="@+id/providerHelpText"
+          android:textAppearance="@style/tink_micro"
+          android:layout_width="0dp"
+          android:layout_height="wrap_content"
+          android:layout_marginTop="12dp"
+          android:paddingBottom="20dp"
+          app:layout_constraintEnd_toEndOf="@id/credentialsFields"
+          app:layout_constraintStart_toStartOf="@id/credentialsFields"
+          app:layout_constraintTop_toBottomOf="@id/credentialsFields" />
+
+        <ImageView
+          android:id="@+id/emptyFieldsBankLogo"
+          android:layout_width="60dp"
+          android:layout_height="60dp"
+          android:layout_marginTop="192dp"
+          app:layout_constraintEnd_toEndOf="parent"
+          app:layout_constraintStart_toStartOf="parent"
+          app:layout_constraintTop_toTopOf="parent" />
+
+        <androidx.constraintlayout.widget.Group
+          android:id="@+id/credentialsFieldsHelpTextGroup"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          app:constraint_referenced_ids="credentialsFields, providerHelpText" />
+
+        <androidx.constraintlayout.widget.Group
+          android:id="@+id/emptyFieldsGroup"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          app:constraint_referenced_ids="emptyFieldsBankLogo, emptyFieldsLoginText" />
+
+        <com.google.android.material.textview.MaterialTextView
+          android:id="@+id/emptyFieldsLoginText"
+          android:textAppearance="@style/tink_hecto.bold"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_marginTop="24dp"
+          android:layout_marginStart="56dp"
+          android:layout_marginEnd="56dp"
+          app:layout_constraintEnd_toEndOf="parent"
+          app:layout_constraintStart_toStartOf="parent"
+          app:layout_constraintTop_toBottomOf="@id/emptyFieldsBankLogo" />
+
         <Space
           android:id="@+id/bottomSpacer"
           android:layout_width="0dp"
           android:layout_height="0dp"
-          app:layout_constraintTop_toBottomOf="@id/credentialsFields"
+          app:layout_constraintTop_toBottomOf="@id/providerHelpText"
           app:layout_constraintStart_toStartOf="parent"
           app:layout_constraintEnd_toEndOf="parent"/>
 
@@ -95,7 +144,7 @@
         android:paddingEnd="28dp"
         android:paddingBottom="12dp"
         android:text="@string/tink_credentials_continue_button"
-        app:layout_constraintBottom_toTopOf="@id/termsAndConditionsText"
+        app:layout_constraintBottom_toTopOf="@id/termsAndConsentText"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent" />
 
@@ -130,7 +179,7 @@
         app:lineHeight="@dimen/tink_deci_line_height"
         android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintBottom_toTopOf="@id/termsAndConditionsText"
+        app:layout_constraintBottom_toTopOf="@id/termsAndConsentText"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent" />
 
@@ -142,8 +191,8 @@
         app:constraint_referenced_ids="bankIdButton" />
 
       <com.google.android.material.textview.MaterialTextView
-        android:id="@+id/termsAndConditionsText"
-        style="@style/tink_micro"
+        android:id="@+id/termsAndConsentText"
+        android:textAppearance="@style/tink_micro"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="24dp"
@@ -163,7 +212,7 @@
     layout="@layout/tink_layout_credentials_authenticate"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:layout_below="@id/toolbar"
+    android:layout_below="@id/toolbarWithLogo"
     android:visibility="gone" />
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/link-ui/src/main/res/layout/tink_layout_consent.xml b/link-ui/src/main/res/layout/tink_layout_consent.xml
deleted file mode 100644
index f7ab6e9dd..000000000
--- a/link-ui/src/main/res/layout/tink_layout_consent.xml
+++ /dev/null
@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:app="http://schemas.android.com/apk/res-auto"
-  xmlns:tools="http://schemas.android.com/tools"
-  android:layout_width="match_parent"
-  android:layout_height="wrap_content">
-
-  <View
-    android:id="@+id/consentBackground"
-    android:layout_width="0dp"
-    android:layout_height="0dp"
-    android:alpha="0.05"
-    android:background="?tink_colorPrimary"
-    app:layout_constraintBottom_toBottomOf="parent"
-    app:layout_constraintEnd_toEndOf="parent"
-    app:layout_constraintStart_toStartOf="parent"
-    app:layout_constraintTop_toTopOf="parent" />
-
-  <ImageView
-    android:id="@+id/logo"
-    android:layout_width="40dp"
-    android:layout_height="40dp"
-    android:layout_marginStart="16dp"
-    android:layout_marginTop="20dp"
-    android:scaleType="fitCenter"
-    app:layout_constraintBottom_toTopOf="@id/bankGroupBarrier"
-    app:layout_constraintStart_toStartOf="parent"
-    app:layout_constraintTop_toTopOf="parent" />
-
-  <com.google.android.material.textview.MaterialTextView
-    android:id="@+id/bankName"
-    style="@style/tink_hecto.bold"
-    android:layout_width="0dp"
-    android:layout_height="wrap_content"
-    android:layout_marginStart="12dp"
-    android:layout_marginTop="20dp"
-    android:layout_marginEnd="16dp"
-    android:gravity="center_vertical"
-    app:layout_constraintBottom_toTopOf="@id/bankGroupBarrier"
-    app:layout_constraintEnd_toStartOf="@+id/tinkLogo"
-    app:layout_constraintStart_toEndOf="@+id/logo"
-    app:layout_constraintTop_toTopOf="parent"
-    tools:text="Bank Name" />
-
-  <androidx.constraintlayout.widget.Barrier
-    android:id="@+id/bankGroupBarrier"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    app:barrierDirection="bottom"
-    app:constraint_referenced_ids="logo,bankName" />
-
-  <ImageView
-    android:id="@+id/tinkLogo"
-    android:layout_width="40dp"
-    android:layout_height="20dp"
-    android:layout_marginEnd="16dp"
-    android:layout_marginTop="20dp"
-    android:background="@drawable/tink_logo"
-    android:backgroundTint="?tink_textColorPrimary"
-    android:visibility="gone"
-    app:layout_constraintEnd_toEndOf="parent"
-    app:layout_constraintTop_toTopOf="parent" />
-
-  <Space
-    android:id="@+id/bankGroupSpacer"
-    android:layout_width="1dp"
-    android:layout_height="20dp"
-    app:layout_constraintTop_toBottomOf="@id/bankGroupBarrier" />
-
-  <View
-    android:id="@+id/dottedLine"
-    android:layout_width="0dp"
-    android:layout_height="0dp"
-    android:background="@drawable/tink_dotted_line"
-    android:layerType="software"
-    app:layout_constraintEnd_toEndOf="@id/logo"
-    app:layout_constraintStart_toStartOf="@id/logo"
-    app:layout_constraintTop_toBottomOf="@id/logo"
-    app:layout_constraintBottom_toTopOf="@id/userIconBackground" />
-
-  <View
-    android:id="@+id/userIconBackground"
-    android:layout_width="40dp"
-    android:layout_height="40dp"
-    android:alpha="0.1"
-    android:background="@drawable/tink_rounded_background"
-    android:scaleType="fitCenter"
-    app:layout_constraintStart_toStartOf="@id/logo"
-    app:layout_constraintTop_toBottomOf="@id/bankGroupSpacer" />
-
-  <ImageView
-    android:id="@+id/userIcon"
-    android:layout_width="40dp"
-    android:layout_height="40dp"
-    android:scaleType="fitCenter"
-    android:padding="8dp"
-    android:src="@drawable/tink_user"
-    android:tint="?tink_colorPrimary"
-    app:layout_constraintBottom_toBottomOf="@+id/userIconBackground"
-    app:layout_constraintEnd_toEndOf="@+id/userIconBackground"
-    app:layout_constraintStart_toStartOf="@+id/userIconBackground"
-    app:layout_constraintTop_toTopOf="@+id/userIconBackground" />
-
-  <com.google.android.material.textview.MaterialTextView
-    android:id="@+id/consentInformation"
-    style="@style/tink_deci.primary"
-    android:layout_width="0dp"
-    android:layout_height="wrap_content"
-    android:layout_marginStart="12dp"
-    android:layout_marginEnd="32dp"
-    app:layout_constraintEnd_toEndOf="parent"
-    app:layout_constraintStart_toEndOf="@+id/userIconBackground"
-    app:layout_constraintTop_toBottomOf="@+id/bankGroupSpacer"
-    tools:text="Application will obtain some of your financial information. Read More" />
-
-  <Space
-    android:layout_width="match_parent"
-    android:layout_height="24dp"
-    app:layout_constraintTop_toBottomOf="@id/consentInformation" />
-
-  <androidx.constraintlayout.widget.Group
-    android:id="@+id/userGroup"
-    android:layout_width="0dp"
-    android:layout_height="0dp"
-    android:visibility="gone"
-    app:constraint_referenced_ids="bankGroupSpacer, dottedLine, userIcon, userIconBackground, consentInformation" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/link-ui/src/main/res/layout/tink_layout_toolbar_with_logo.xml b/link-ui/src/main/res/layout/tink_layout_toolbar_with_logo.xml
new file mode 100644
index 000000000..55c6dd2e2
--- /dev/null
+++ b/link-ui/src/main/res/layout/tink_layout_toolbar_with_logo.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.google.android.material.appbar.MaterialToolbar xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:app="http://schemas.android.com/apk/res-auto"
+  android:id="@+id/toolbarWithLogo"
+  app:theme="@style/Tink_ToolbarStyle"
+  android:layout_width="match_parent"
+  android:layout_height="wrap_content"
+  android:elevation="4dp"
+  app:titleTextAppearance="@style/tink_mega"
+  app:navigationIcon="@drawable/tink_close"
+  app:titleTextColor="?tink_colorOnPrimary">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:gravity="center_vertical">
+
+        <ImageView
+            android:id="@+id/logoView"
+            android:layout_width="wrap_content"
+            android:layout_height="20dp"
+            android:layout_marginTop="2dp" />
+
+        <com.google.android.material.textview.MaterialTextView
+            android:id="@+id/toolbarTitleView"
+            android:textAppearance="@style/tink_mega"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="16dp"
+            android:textColor="?tink_colorOnPrimary"
+            android:maxLines="1"
+            android:ellipsize="end"/>
+
+    </LinearLayout>
+
+</com.google.android.material.appbar.MaterialToolbar>
\ No newline at end of file
diff --git a/link-ui/src/main/res/values-da/strings.xml b/link-ui/src/main/res/values-da/strings.xml
index 805cb1bb9..91070b610 100644
--- a/link-ui/src/main/res/values-da/strings.xml
+++ b/link-ui/src/main/res/values-da/strings.xml
@@ -22,13 +22,16 @@
     <string name="tink_provider_select_credentials_type_title">Logonmetode</string>
     <string name="tink_credentials_authentication_title">Godkendelse</string>
     <string name="tink_credentials_consent_information_text">%1$s får nogle af dine finansielle oplysninger. %2$s</string>
-    <string name="tink_credentials_consent_information_read_more">Læs mere</string>
+    <string name="tink_credentials_consent_information_read_more">Se detaljer</string>
     <string name="tink_credentials_unverified_warning_text">Ubekræftet  enne løsning er kun lavet til udviklingsformål. Indtast ikke dine bankoplysninger, medmindre du har tillid til udvikleren.</string>
-    <string name="tink_credentials_continue_button">Fortsæt</string>
+    <string name="tink_credentials_empty_fields_login">Log ind på %s for at fortsætte</string>
+    <string name="tink_credentials_continue_button">Log ind</string>
     <string name="tink_credentials_bankid_button">Åbn BankID</string>
-    <string name="tink_credentials_terms_text">Ved at bruge denne tjeneste accepterer du Tinks %1$s and %2$s</string>
+    <string name="tink_credentials_terms_text">Ved at bruge denne tjeneste accepterer du Tinks %1$s and %2$s. %3$s</string>
     <string name="tink_credentials_terms_and_conditions">vilkår og betingelser</string>
     <string name="tink_credentials_privacy_policy">fortrolighedspolitik</string>
+    <string name="tink_credentials_field_validation_error_maxLengthLimit">Dette felt kan ikke ære længere end %d</string>
+    <string name="tink_credentials_field_validation_error_minLengthLimit">Dette felt skal indeholde mindst %d tegn</string>
     <string name="tink_consent_information_title">Vi indsamler følgende data fra dig</string>
     <string name="tink_consent_information_description">Ved at følge denne tjeneste indsamler vi finansielle data fra dig. Dette er de datapunkter, vi indsamler fra dig:</string>
     <string name="tink_third_party_authentication_download_app_button">Download</string>
diff --git a/link-ui/src/main/res/values-de/strings.xml b/link-ui/src/main/res/values-de/strings.xml
index 59de8e712..79eeeaea6 100644
--- a/link-ui/src/main/res/values-de/strings.xml
+++ b/link-ui/src/main/res/values-de/strings.xml
@@ -22,13 +22,16 @@
     <string name="tink_provider_select_credentials_type_title">anmeldemethode</string>
     <string name="tink_credentials_authentication_title">Authentifizierung</string>
     <string name="tink_credentials_consent_information_text">%1$s wird einige Ihrer finanziellen Informationen einholen. %2$s</string>
-    <string name="tink_credentials_consent_information_read_more">Mehr erfahren</string>
+    <string name="tink_credentials_consent_information_read_more">Details anzeigen</string>
     <string name="tink_credentials_unverified_warning_text">Unverifiziert - Diese Lösung ist nur für Entwicklungszwecke gedacht. Geben Sie Ihre Bankdaten nur dann ein, wenn Sie dem Entwickler vertrauen.</string>
-    <string name="tink_credentials_continue_button">Weiter</string>
+    <string name="tink_credentials_empty_fields_login">Zum Fortfahren bei %s anmelden</string>
+    <string name="tink_credentials_continue_button">Anmelden</string>
     <string name="tink_credentials_bankid_button">BankID öffnen</string>
-    <string name="tink_credentials_terms_text">Mit der Nutzung dieses Services akzeptieren Sie die %1$s und %2$s von Tink</string>
+    <string name="tink_credentials_terms_text">Mit der Nutzung dieses Services akzeptieren Sie die %1$s und %2$s von Tink. %3$s</string>
     <string name="tink_credentials_terms_and_conditions">Nutzungsbedingungen</string>
     <string name="tink_credentials_privacy_policy">Datenschutzrichtlinie</string>
+    <string name="tink_credentials_field_validation_error_maxLengthLimit">Dieses Feld darf nur max. %d Zeichen enthalten</string>
+    <string name="tink_credentials_field_validation_error_minLengthLimit">Dieses Feld muss mindestens %d Zeichen enthalten</string>
     <string name="tink_consent_information_title">Wir werden die folgenden Daten von Ihnen erfassen</string>
     <string name="tink_consent_information_description">Wenn Sie diesen Service in Anspruch nehmen, sammeln wir Finanzdaten von Ihnen. Dies sind die Datenpunkte, die wir von Ihnen erfassen werden:</string>
     <string name="tink_third_party_authentication_download_app_button">Herunterladen</string>
diff --git a/link-ui/src/main/res/values-es/strings.xml b/link-ui/src/main/res/values-es/strings.xml
index 32c80e2ab..3f1ea7467 100644
--- a/link-ui/src/main/res/values-es/strings.xml
+++ b/link-ui/src/main/res/values-es/strings.xml
@@ -22,13 +22,16 @@
     <string name="tink_provider_select_credentials_type_title">Método de inicio de sesión</string>
     <string name="tink_credentials_authentication_title">Autentificación</string>
     <string name="tink_credentials_consent_information_text">%1$s obtendrá parte de tu información financiera. %2$s</string>
-    <string name="tink_credentials_consent_information_read_more">Más información</string>
+    <string name="tink_credentials_consent_information_read_more">Consulta los detalles</string>
     <string name="tink_credentials_unverified_warning_text">Sin verificar: Esta solución se ha creado solo con propósitos de desarrollo. No introduzcas tus credenciales del banco a menos que confíes en el desarrollador.</string>
-    <string name="tink_credentials_continue_button">Continuar</string>
+    <string name="tink_credentials_empty_fields_login">Inicia sesión en %s para continuar</string>
+    <string name="tink_credentials_continue_button">Iniciar sesión</string>
     <string name="tink_credentials_bankid_button">Abrir BankID</string>
-    <string name="tink_credentials_terms_text">Al usar el servicio, aceptas los %1$s y la %2$s de Tink</string>
+    <string name="tink_credentials_terms_text">Al usar el servicio, aceptas los %1$s y la %2$s de Tink. %3$s</string>
     <string name="tink_credentials_terms_and_conditions">Términos y condiciones</string>
     <string name="tink_credentials_privacy_policy">Política de privacidad</string>
+    <string name="tink_credentials_field_validation_error_maxLengthLimit">Este campo no puede contener más de %d caracteres</string>
+    <string name="tink_credentials_field_validation_error_minLengthLimit">Este campo debe tener al menos %d caracteres</string>
     <string name="tink_consent_information_title">Recopilaremos los siguientes datos tuyos</string>
     <string name="tink_consent_information_description">Si sigues usando este servicio, recopilaremos datos financieros. Esta es la información que recopilaremos sobre ti:</string>
     <string name="tink_third_party_authentication_download_app_button">Descargar</string>
diff --git a/link-ui/src/main/res/values-fi/strings.xml b/link-ui/src/main/res/values-fi/strings.xml
index 234e4eebb..ecc4760de 100644
--- a/link-ui/src/main/res/values-fi/strings.xml
+++ b/link-ui/src/main/res/values-fi/strings.xml
@@ -22,13 +22,16 @@
     <string name="tink_provider_select_credentials_type_title">Kirjautumistapa</string>
     <string name="tink_credentials_authentication_title">Henkilöllisyyden todentaminen</string>
     <string name="tink_credentials_consent_information_text">%1$s saa joitakin taloudellisia tietojasi. %2$s</string>
-    <string name="tink_credentials_consent_information_read_more">Lue lisää</string>
+    <string name="tink_credentials_consent_information_read_more">Näytä tiedot</string>
     <string name="tink_credentials_unverified_warning_text">Varmistamaton - Tämä ratkaisu on tehty vain kehitystarkoituksiin. Älä anna tunnistetietoja pankkiisi, jos et luota kehittäjään.</string>
-    <string name="tink_credentials_continue_button">Jatka</string>
+    <string name="tink_credentials_empty_fields_login">Kirjaudu sisään %s-palveluun, niin voit jatkaa</string>
+    <string name="tink_credentials_continue_button">Kirjaudu sisään</string>
     <string name="tink_credentials_bankid_button">Avaa BankID</string>
-    <string name="tink_credentials_terms_text">Palvelua käyttämällä hyväksyt Tinkin %1$s and %2$s</string>
+    <string name="tink_credentials_terms_text">Palvelua käyttämällä hyväksyt Tinkin %1$s and %2$s. %3$s</string>
     <string name="tink_credentials_terms_and_conditions">käyttöehdot</string>
     <string name="tink_credentials_privacy_policy">tietosuojakäytännön</string>
+    <string name="tink_credentials_field_validation_error_maxLengthLimit">Tässä kentässä saa olla enintään %d merkkiä</string>
+    <string name="tink_credentials_field_validation_error_minLengthLimit">Tässä kentässä on oltava vähintään %d merkkiä</string>
     <string name="tink_consent_information_title">Keräämme seuraavat sinua koskevat tiedot</string>
     <string name="tink_consent_information_description">Kun käytät tätä palvelua, keräämme sinua koskevia taloudellisia tietoja. Keräämme nämä sinua koskevat tiedot:</string>
     <string name="tink_third_party_authentication_download_app_button">Lataa</string>
diff --git a/link-ui/src/main/res/values-fr/strings.xml b/link-ui/src/main/res/values-fr/strings.xml
index 13a633433..480928cf4 100644
--- a/link-ui/src/main/res/values-fr/strings.xml
+++ b/link-ui/src/main/res/values-fr/strings.xml
@@ -22,13 +22,16 @@
     <string name="tink_provider_select_credentials_type_title">Moyen de connexion</string>
     <string name="tink_credentials_authentication_title">Authentification</string>
     <string name="tink_credentials_consent_information_text">%1$s obtiendra certaines de vos informations financières. %2$s</string>
-    <string name="tink_credentials_consent_information_read_more">Lire plus</string>
+    <string name="tink_credentials_consent_information_read_more">Voir les détails</string>
     <string name="tink_credentials_unverified_warning_text">Non vérifiée. Cette solution n\'est accessible qu\'à des fins de développement. Ne saisissez pas vos informations bancaires, sauf si vous faites totalement confiance au développeur.</string>
-    <string name="tink_credentials_continue_button">Continuer</string>
+    <string name="tink_credentials_empty_fields_login">Connectez-vous à %s pour continuer</string>
+    <string name="tink_credentials_continue_button">Connexion</string>
     <string name="tink_credentials_bankid_button">Ouvrir BankID</string>
-    <string name="tink_credentials_terms_text">En utilisant ce service, vous acceptez les %1$s et la %2$s de Tink</string>
+    <string name="tink_credentials_terms_text">En utilisant ce service, vous acceptez les %1$s et la %2$s de Tink. %3$s</string>
     <string name="tink_credentials_terms_and_conditions">Conditions d\'utilisation</string>
     <string name="tink_credentials_privacy_policy">Politique de confidentialité</string>
+    <string name="tink_credentials_field_validation_error_maxLengthLimit">Ce champ ne peut pas comporter plus de %d caractères</string>
+    <string name="tink_credentials_field_validation_error_minLengthLimit">Ce champ doit comporter au moins %d caractères</string>
     <string name="tink_consent_information_title">Nous recueillerons les données suivantes de votre part</string>
     <string name="tink_consent_information_description">Si vous continuez à utiliser ce service, nous recueillerons des données financières de votre part. Voici les points de données que nous recueillerons :</string>
     <string name="tink_third_party_authentication_download_app_button">Télécharger</string>
diff --git a/link-ui/src/main/res/values-it/strings.xml b/link-ui/src/main/res/values-it/strings.xml
index 6fa2522c2..98c22607c 100644
--- a/link-ui/src/main/res/values-it/strings.xml
+++ b/link-ui/src/main/res/values-it/strings.xml
@@ -22,13 +22,16 @@
     <string name="tink_provider_select_credentials_type_title">Metodo di accesso</string>
     <string name="tink_credentials_authentication_title">Autenticazione</string>
     <string name="tink_credentials_consent_information_text">%1$s acquisirà alcune delle tue informazioni finanziarie. %2$s</string>
-    <string name="tink_credentials_consent_information_read_more">Altre informazioni</string>
+    <string name="tink_credentials_consent_information_read_more">Guarda i dettagli</string>
     <string name="tink_credentials_unverified_warning_text">Non verificato: questa soluzione è stata realizzata esclusivamente a scopo di sviluppo. Non inserire le tue credenziali bancarie a meno che non ti fidi dello sviluppatore.</string>
-    <string name="tink_credentials_continue_button">Continua la modifica</string>
+    <string name="tink_credentials_empty_fields_login">Accedi a %s per continuare</string>
+    <string name="tink_credentials_continue_button">Accedi</string>
     <string name="tink_credentials_bankid_button">Apri BankID</string>
-    <string name="tink_credentials_terms_text">Utilizzando il servizio, accetti i Termini e condizioni di Tink e %1$s sulla %2$s</string>
+    <string name="tink_credentials_terms_text">Utilizzando il servizio, accetti i Termini e condizioni di Tink e %1$s sulla %2$s. %3$s</string>
     <string name="tink_credentials_terms_and_conditions">l\'Informativa</string>
     <string name="tink_credentials_privacy_policy">privacy</string>
+    <string name="tink_credentials_field_validation_error_maxLengthLimit">Questo campo non può superare i %d caratteri</string>
+    <string name="tink_credentials_field_validation_error_minLengthLimit">Questo campo deve contenere almeno %d caratteri</string>
     <string name="tink_consent_information_title">Acquisiremo i seguenti dati</string>
     <string name="tink_consent_information_description">Proseguendo nella fruizione di questo servizio, acquisiremo i tuoi dati finanziari. Questi sono i dati che acquisiremo:</string>
     <string name="tink_third_party_authentication_download_app_button">Download</string>
diff --git a/link-ui/src/main/res/values-nl/strings.xml b/link-ui/src/main/res/values-nl/strings.xml
index 1ab9acaf9..64bf461c3 100644
--- a/link-ui/src/main/res/values-nl/strings.xml
+++ b/link-ui/src/main/res/values-nl/strings.xml
@@ -22,13 +22,16 @@
     <string name="tink_provider_select_credentials_type_title">inlogmethode</string>
     <string name="tink_credentials_authentication_title">Authenticatie</string>
     <string name="tink_credentials_consent_information_text">%1$s zal wat financiële gegevens over je verzamelen. %2$s</string>
-    <string name="tink_credentials_consent_information_read_more">Meer lezen</string>
+    <string name="tink_credentials_consent_information_read_more">Details bekijken</string>
     <string name="tink_credentials_unverified_warning_text">Niet geverifieerd. Deze oplossing is alleen bedoeld voor ontwikkelingsdoeleinden. Voer geen bankgegevens in, tenzij je de ontwikkelaar vertrouwt.</string>
-    <string name="tink_credentials_continue_button">Volgende</string>
+    <string name="tink_credentials_empty_fields_login">Log in bij %s om verder te gaan</string>
+    <string name="tink_credentials_continue_button">Inloggen</string>
     <string name="tink_credentials_bankid_button">BankID openen</string>
-    <string name="tink_credentials_terms_text">Door de dienst te gebruiken, ga je akkoord met de %1$s en het %2$s van Tink</string>
+    <string name="tink_credentials_terms_text">Door de dienst te gebruiken, ga je akkoord met de %1$s en het %2$s van Tink. %3$s</string>
     <string name="tink_credentials_terms_and_conditions">algemene voorwaarden</string>
     <string name="tink_credentials_privacy_policy">privacybeleid</string>
+    <string name="tink_credentials_field_validation_error_maxLengthLimit">Dit veld mag niet langer zijn dan %d tekens</string>
+    <string name="tink_credentials_field_validation_error_minLengthLimit">Dit veld moet minimaal %d tekens bevatten</string>
     <string name="tink_consent_information_title">We verzamelen de volgende gegevens over je</string>
     <string name="tink_consent_information_description">Door verder te gaan met deze dienst, zullen wij financiële gegevens over je verzamelen. Dit zijn de datapunten die we over je verzamelen:</string>
     <string name="tink_third_party_authentication_download_app_button">Downloaden</string>
diff --git a/link-ui/src/main/res/values-no/strings.xml b/link-ui/src/main/res/values-no/strings.xml
index b4298c371..a75bbe04c 100644
--- a/link-ui/src/main/res/values-no/strings.xml
+++ b/link-ui/src/main/res/values-no/strings.xml
@@ -22,13 +22,16 @@
     <string name="tink_provider_select_credentials_type_title">påloggingsmetode</string>
     <string name="tink_credentials_authentication_title">Godkjenning</string>
     <string name="tink_credentials_consent_information_text">%1$s vil samle inn noen av dine finansielle opplysninger. %2$s</string>
-    <string name="tink_credentials_consent_information_read_more">Les mer</string>
+    <string name="tink_credentials_consent_information_read_more">Vis detaljer</string>
     <string name="tink_credentials_unverified_warning_text">Ikke verifisert. Denne løsningen er bare til utviklingsformål. Ikke oppgi bankinformasjonen din med mindre du stoler på utvikleren.</string>
-    <string name="tink_credentials_continue_button">Fortsett</string>
+    <string name="tink_credentials_empty_fields_login">Logg på %s for å fortsette</string>
+    <string name="tink_credentials_continue_button">Logg på</string>
     <string name="tink_credentials_bankid_button">Åpne BankID</string>
-    <string name="tink_credentials_terms_text">Ved at du bruker denne tjenesten, godtar du Tinks %1$s and %2$s</string>
+    <string name="tink_credentials_terms_text">Ved at du bruker denne tjenesten, godtar du Tinks %1$s and %2$s. %3$s</string>
     <string name="tink_credentials_terms_and_conditions">Vilkår</string>
     <string name="tink_credentials_privacy_policy">Personvernerklæring</string>
+    <string name="tink_credentials_field_validation_error_maxLengthLimit">Dette feltet kan ikke være lengre enn %d</string>
+    <string name="tink_credentials_field_validation_error_minLengthLimit">Dette feltet må inneholde minst %d tegn</string>
     <string name="tink_consent_information_title">Vi vil samle inn følgende data fra deg</string>
     <string name="tink_consent_information_description">Gjennom denne tjenesten samler vi inn finansielle data fra deg. Disse datapunktene vil vi samle inn fra deg:</string>
     <string name="tink_third_party_authentication_download_app_button">Last ned</string>
diff --git a/link-ui/src/main/res/values-pt/strings.xml b/link-ui/src/main/res/values-pt/strings.xml
index ed3b37e1b..4ab8f92ec 100644
--- a/link-ui/src/main/res/values-pt/strings.xml
+++ b/link-ui/src/main/res/values-pt/strings.xml
@@ -22,13 +22,16 @@
     <string name="tink_provider_select_credentials_type_title">método de início de sessão</string>
     <string name="tink_credentials_authentication_title">Autenticação</string>
     <string name="tink_credentials_consent_information_text">%1$s vai receber alguma da sua informação financeira. %2$s</string>
-    <string name="tink_credentials_consent_information_read_more">Leia mais</string>
+    <string name="tink_credentials_consent_information_read_more">Ver detalhes</string>
     <string name="tink_credentials_unverified_warning_text">Por verificar - esta solução apenas está construída para fins de desenvolvimento. Não introduza as credenciais do seu banco se não confiar no desenvolvedor.</string>
-    <string name="tink_credentials_continue_button">Continuar</string>
+    <string name="tink_credentials_empty_fields_login">Inicie sessão em %s para continuar</string>
+    <string name="tink_credentials_continue_button">Iniciar sessão</string>
     <string name="tink_credentials_bankid_button">Abrir BankID</string>
-    <string name="tink_credentials_terms_text">Ao usar o serviço, concorda com os %1$s e %2$s</string>
+    <string name="tink_credentials_terms_text">Ao usar o serviço, concorda com os %1$s e %2$s. %3$s</string>
     <string name="tink_credentials_terms_and_conditions">Termos e condições</string>
     <string name="tink_credentials_privacy_policy">Política de privacidade</string>
+    <string name="tink_credentials_field_validation_error_maxLengthLimit">Este campo não pode ter mais de %d caracteres</string>
+    <string name="tink_credentials_field_validation_error_minLengthLimit">Este campo deve ter, pelo menos, %d caracteres</string>
     <string name="tink_consent_information_title">Iremos recolher os seguintes dados seus</string>
     <string name="tink_consent_information_description">Ao continuar através deste serviço, iremos recolher os seus dados financeiros. Estes são os seus dados que iremos recolher:</string>
     <string name="tink_third_party_authentication_download_app_button">Transferir</string>
diff --git a/link-ui/src/main/res/values-sv-rSE/strings.xml b/link-ui/src/main/res/values-sv-rSE/strings.xml
index e88c39864..4b6bd5680 100644
--- a/link-ui/src/main/res/values-sv-rSE/strings.xml
+++ b/link-ui/src/main/res/values-sv-rSE/strings.xml
@@ -22,13 +22,16 @@
     <string name="tink_provider_select_credentials_type_title">Inloggningsmetod</string>
     <string name="tink_credentials_authentication_title">Autentiseringen</string>
     <string name="tink_credentials_consent_information_text">%1$s kommer att få dina ekonomiska uppgifter. %2$s</string>
-    <string name="tink_credentials_consent_information_read_more">Läs mer</string>
+    <string name="tink_credentials_consent_information_read_more">Visa detaljer</string>
     <string name="tink_credentials_unverified_warning_text">Overifierad - Den här lösningen är endast gjord i utvecklingssyfte. Ange inte dina inloggningsuppgifter om du inte litar på utvecklaren.</string>
-    <string name="tink_credentials_continue_button">Fortsätt</string>
+    <string name="tink_credentials_empty_fields_login">Logga in på %s för att fortsätta</string>
+    <string name="tink_credentials_continue_button">Logga in</string>
     <string name="tink_credentials_bankid_button">Öppna BankID</string>
-    <string name="tink_credentials_terms_text">Genom att använda tjänsten godkänner du Tinks %1$s and %2$s</string>
+    <string name="tink_credentials_terms_text">Genom att använda tjänsten godkänner du Tinks %1$s and %2$s. %3$s</string>
     <string name="tink_credentials_terms_and_conditions">Användarvillkor</string>
     <string name="tink_credentials_privacy_policy">Integritetspolicy</string>
+    <string name="tink_credentials_field_validation_error_maxLengthLimit">Detta fält kan inte vara längre än %d tecken</string>
+    <string name="tink_credentials_field_validation_error_minLengthLimit">Fältet måste vara minst %d tecken</string>
     <string name="tink_consent_information_title">Vi samlar in följande uppgifter om dig</string>
     <string name="tink_consent_information_description">Genom att använda denna tjänst samlar vi in finansuppgifter om dig. Vi samlar in följande datapunkter:</string>
     <string name="tink_third_party_authentication_download_app_button">Ladda ner</string>
diff --git a/link-ui/src/main/res/values/strings.xml b/link-ui/src/main/res/values/strings.xml
index e646d8701..dac8e0089 100644
--- a/link-ui/src/main/res/values/strings.xml
+++ b/link-ui/src/main/res/values/strings.xml
@@ -22,13 +22,16 @@
   <string name="tink_provider_select_credentials_type_title">Sign in method</string>
   <string name="tink_credentials_authentication_title">Authentication</string>
   <string name="tink_credentials_consent_information_text">%1$s will obtain some of your financial information. %2$s</string>
-  <string name="tink_credentials_consent_information_read_more">Read More</string>
+  <string name="tink_credentials_consent_information_read_more">View details</string>
   <string name="tink_credentials_unverified_warning_text">Unverified - This solution is only made for development purposes. Do not enter your bank credentials unless you trust the developer.</string>
-  <string name="tink_credentials_continue_button">Continue</string>
+  <string name="tink_credentials_empty_fields_login">Log in to %s to continue</string>
+  <string name="tink_credentials_continue_button">Log in</string>
   <string name="tink_credentials_bankid_button">Open BankID</string>
-  <string name="tink_credentials_terms_text">By using the service, you agree to Tink’s %1$s and %2$s</string>
+  <string name="tink_credentials_terms_text">By using the service, you agree to Tink’s %1$s and %2$s. %3$s</string>
   <string name="tink_credentials_terms_and_conditions">Terms and Conditions</string>
   <string name="tink_credentials_privacy_policy">Privacy Policy</string>
+  <string name="tink_credentials_field_validation_error_maxLengthLimit">This field cannot be longer than %d characters</string>
+  <string name="tink_credentials_field_validation_error_minLengthLimit">This field must be at least %d characters</string>
   <string name="tink_consent_information_title">We will collect the following data from you</string>
   <string name="tink_consent_information_description">By following through this service, we will collect financial data from you. These are the data points we will collect from you:</string>
   <string name="tink_third_party_authentication_download_app_button">Download</string>