diff --git a/library/ui-styles/src/main/res/drawable/bg_waiting_for_email_verification.xml b/library/ui-styles/src/main/res/drawable/bg_gradient_ftue_breaker.xml
similarity index 100%
rename from library/ui-styles/src/main/res/drawable/bg_waiting_for_email_verification.xml
rename to library/ui-styles/src/main/res/drawable/bg_gradient_ftue_breaker.xml
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthResetPasswordBreakerFragment.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthResetPasswordBreakerFragment.kt
index 31f934b356..41e24e96c2 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthResetPasswordBreakerFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthResetPasswordBreakerFragment.kt
@@ -54,12 +54,7 @@ class FtueAuthResetPasswordBreakerFragment : AbstractFtueAuthFragment<FragmentFt
     }
 
     private fun setupUi() {
-        views.resetPasswordBreakerGradientContainer.setBackgroundResource(
-                when (themeProvider.isLightTheme()) {
-                    true  -> R.drawable.bg_waiting_for_email_verification
-                    false -> R.drawable.bg_color_background
-                }
-        )
+        views.resetPasswordBreakerGradientContainer.setBackgroundResource(themeProvider.ftueBreakerBackground())
         views.resetPasswordBreakerTitle.text = getString(R.string.ftue_auth_reset_password_breaker_title)
                 .colorTerminatingFullStop(ThemeUtils.getColor(requireContext(), R.attr.colorSecondary))
         views.resetPasswordBreakerSubtitle.text = getString(R.string.ftue_auth_email_verification_subtitle, params.email)
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthWaitForEmailFragment.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthWaitForEmailFragment.kt
index 75090f2a55..4649c7c799 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthWaitForEmailFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthWaitForEmailFragment.kt
@@ -58,12 +58,7 @@ class FtueAuthWaitForEmailFragment @Inject constructor(
     }
 
     private fun setupUi() {
-        views.emailVerificationGradientContainer.setBackgroundResource(
-                when (themeProvider.isLightTheme()) {
-                    true -> R.drawable.bg_waiting_for_email_verification
-                    false -> R.drawable.bg_color_background
-                }
-        )
+        views.emailVerificationGradientContainer.setBackgroundResource(themeProvider.ftueBreakerBackground())
         views.emailVerificationTitle.text = getString(R.string.ftue_auth_email_verification_title)
                 .colorTerminatingFullStop(ThemeUtils.getColor(requireContext(), R.attr.colorSecondary))
         views.emailVerificationSubtitle.text = getString(R.string.ftue_auth_email_verification_subtitle, params.email)
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueExtensions.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueExtensions.kt
index 8d63fbf547..8deb10b7b8 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueExtensions.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueExtensions.kt
@@ -18,9 +18,11 @@ package im.vector.app.features.onboarding.ftueauth
 
 import android.widget.Button
 import com.google.android.material.textfield.TextInputLayout
+import im.vector.app.R
 import im.vector.app.core.extensions.hasContentFlow
 import im.vector.app.features.login.SignMode
 import im.vector.app.features.onboarding.OnboardingAction
+import im.vector.app.features.themes.ThemeProvider
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.onEach
@@ -49,3 +51,8 @@ fun observeContentChangesAndResetErrors(username: TextInputLayout, password: Tex
         submit.isEnabled = it
     }
 }
+
+fun ThemeProvider.ftueBreakerBackground() = when (isLightTheme()) {
+    true  -> R.drawable.bg_gradient_ftue_breaker
+    false -> R.drawable.bg_color_background
+}
diff --git a/vector/src/main/res/layout/fragment_ftue_reset_password_breaker.xml b/vector/src/main/res/layout/fragment_ftue_reset_password_breaker.xml
index e395f67b4a..240a0a9980 100644
--- a/vector/src/main/res/layout/fragment_ftue_reset_password_breaker.xml
+++ b/vector/src/main/res/layout/fragment_ftue_reset_password_breaker.xml
@@ -25,7 +25,7 @@
         android:layout_height="0dp"
         app:layout_constraintHeight_percent="0.60"
         app:layout_constraintTop_toTopOf="parent"
-        tools:background="@drawable/bg_waiting_for_email_verification" />
+        tools:background="@drawable/bg_gradient_ftue_breaker" />
 
     <Space
         android:id="@+id/resetPasswordBreakerSpace1"
diff --git a/vector/src/main/res/layout/fragment_ftue_wait_for_email_verification.xml b/vector/src/main/res/layout/fragment_ftue_wait_for_email_verification.xml
index 15aaf4d1b2..fff7d42720 100644
--- a/vector/src/main/res/layout/fragment_ftue_wait_for_email_verification.xml
+++ b/vector/src/main/res/layout/fragment_ftue_wait_for_email_verification.xml
@@ -25,7 +25,7 @@
         android:layout_height="0dp"
         app:layout_constraintHeight_percent="0.60"
         app:layout_constraintTop_toTopOf="parent"
-        tools:background="@drawable/bg_waiting_for_email_verification" />
+        tools:background="@drawable/bg_gradient_ftue_breaker" />
 
     <Space
         android:id="@+id/emailVerificationSpace1"