diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthLoginFragment.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthLoginFragment.kt
index 5830468fcf..ce8131d94b 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthLoginFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthLoginFragment.kt
@@ -7,6 +7,7 @@
 
 package im.vector.app.features.onboarding.ftueauth
 
+import android.annotation.SuppressLint
 import android.os.Build
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -14,6 +15,7 @@ import android.view.View
 import android.view.ViewGroup
 import android.view.inputmethod.EditorInfo
 import androidx.autofill.HintConstants
+import androidx.core.content.ContextCompat
 import androidx.core.text.isDigitsOnly
 import androidx.core.view.isVisible
 import androidx.lifecycle.lifecycleScope
@@ -23,7 +25,6 @@ import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
 import im.vector.app.core.extensions.hideKeyboard
 import im.vector.app.core.extensions.hidePassword
-import im.vector.app.core.extensions.setLeftDrawable
 import im.vector.app.core.extensions.toReducedUrl
 import im.vector.app.core.resources.BuildMeta
 import im.vector.app.core.utils.openUrlInExternalBrowser
@@ -355,6 +356,8 @@ class FtueAuthLoginFragment :
 
     private inner class Tchap {
 
+        // TCHAP Add SuppressLint to fix a false positive
+        @SuppressLint("StringFormatInvalid")
         fun setupUi(state: OnboardingViewState) {
             this@FtueAuthLoginFragment.setupUi(state) // call "super" method
 
@@ -364,7 +367,7 @@ class FtueAuthLoginFragment :
             views.tchapPasswordConfirmationFieldTil.isVisible = isSignUpMode
             views.loginSocialLoginContainer.isVisible = isSignUpMode && vectorFeatures.tchapIsSSOEnabled()
 
-            when(state.signMode) {
+            when (state.signMode) {
                 SignMode.TchapSignUp -> {
                     views.loginSSOSubmit.text = getString(CommonStrings.login_signin_sso, TCHAP_SSO_PROVIDER)
                     views.loginSSOSubmit.debouncedClicks {
@@ -376,7 +379,9 @@ class FtueAuthLoginFragment :
                     }
                 }
                 SignMode.TchapSignInWithSSO -> {
-                    views.loginSubmit.setLeftDrawable(im.vector.lib.ui.styles.R.drawable.ic_tchap_proconnect)
+                    views.loginSubmit.setCompoundDrawablesWithIntrinsicBounds(
+                            ContextCompat.getDrawable(requireContext(), im.vector.lib.ui.styles.R.drawable.ic_tchap_proconnect), null, null, null
+                    )
                     views.loginSSOHelp.text = getString(CommonStrings.tchap_connection_sso_help, TCHAP_SSO_PROVIDER)
                     views.loginSSODescription.text = getString(CommonStrings.tchap_connection_sso_description, TCHAP_SSO_PROVIDER)
                     views.loginSSOHelp.debouncedClicks { openUrlInExternalBrowser(requireContext(), TCHAP_SSO_URL) }
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthSplashFragment.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthSplashFragment.kt
index a6c5158a0e..9b39d53ad6 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthSplashFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthSplashFragment.kt
@@ -16,6 +16,7 @@ import android.text.style.StyleSpan
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.core.content.ContextCompat
 import androidx.core.view.isVisible
 import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.core.resources.BuildMeta
@@ -57,6 +58,9 @@ class FtueAuthSplashFragment :
 
             text = spannable
             isVisible = isAlreadyHaveAccountEnabled && vectorFeatures.tchapIsSSOEnabled()
+            setCompoundDrawablesWithIntrinsicBounds(
+                    ContextCompat.getDrawable(requireContext(), im.vector.lib.ui.styles.R.drawable.ic_tchap_proconnect), null, null, null
+            )
             debouncedClicks { alreadyHaveAnAccountWithSSO() }
         }
         views.loginSplashSSOHelp.apply {
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileAction.kt b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileAction.kt
index 12e264d318..b0ced12706 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileAction.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileAction.kt
@@ -17,6 +17,7 @@ sealed class RoomProfileAction : VectorViewModelAction {
     object ShareRoomProfile : RoomProfileAction()
     object CreateShortcut : RoomProfileAction()
     object RestoreEncryptionState : RoomProfileAction()
+
     // TCHAP force to false to deactivate "Never send messages to unverified devices in room"
 //    data class SetEncryptToVerifiedDeviceOnly(val enabled: Boolean) : RoomProfileAction()
     data class ReportRoom(val reason: String) : RoomProfileAction()
diff --git a/vector/src/main/res/layout/fragment_login.xml b/vector/src/main/res/layout/fragment_login.xml
index 600a121391..bef7929520 100644
--- a/vector/src/main/res/layout/fragment_login.xml
+++ b/vector/src/main/res/layout/fragment_login.xml
@@ -57,11 +57,11 @@
                 <Button
                     android:id="@+id/loginSSOSubmit"
                     style="@style/Widget.Vector.Button.Login"
-                    android:drawableLeft="@drawable/ic_tchap_proconnect"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_gravity="end"
                     android:paddingHorizontal="40dp"
+                    tools:drawableLeft="@drawable/ic_tchap_proconnect"
                     tools:text="@string/login_signin_sso"
                     tools:enabled="false"
                     tools:ignore="RelativeOverlap" />
diff --git a/vector/src/main/res/layout/fragment_tchap_welcome.xml b/vector/src/main/res/layout/fragment_tchap_welcome.xml
index 395f64e958..6c39e20be8 100644
--- a/vector/src/main/res/layout/fragment_tchap_welcome.xml
+++ b/vector/src/main/res/layout/fragment_tchap_welcome.xml
@@ -47,7 +47,6 @@
         style="@style/Widget.Vector.Button.Login"
         android:layout_width="240dp"
         android:layout_height="wrap_content"
-        android:drawableLeft="@drawable/ic_tchap_proconnect"
         android:gravity="start|center_vertical"
         android:paddingHorizontal="25dp"
         android:paddingVertical="10dp"
@@ -57,6 +56,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/fragment_tchap_welcome_subtitle"
         app:layout_constraintVertical_bias="0.492"
+        tools:drawableLeft="@drawable/ic_tchap_proconnect"
         tools:text="@string/login_social_signin_with" />
 
     <Button