diff --git a/library/ui-styles/src/main/res/values-night/bools.xml b/library/ui-styles/src/main/res/values-night/bools.xml
new file mode 100644
index 0000000000..ffeb0000ee
--- /dev/null
+++ b/library/ui-styles/src/main/res/values-night/bools.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <bool name="isDarkMode">true</bool>
+
+</resources>
diff --git a/library/ui-styles/src/main/res/values-night/colors.xml b/library/ui-styles/src/main/res/values-night/colors.xml
new file mode 100644
index 0000000000..34c36cc1ba
--- /dev/null
+++ b/library/ui-styles/src/main/res/values-night/colors.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <color name="modal_background_color">@color/element_system_dark</color>
+
+</resources>
diff --git a/library/ui-styles/src/main/res/values/bools.xml b/library/ui-styles/src/main/res/values/bools.xml
index 93d5f925af..d1d575e7d1 100644
--- a/library/ui-styles/src/main/res/values/bools.xml
+++ b/library/ui-styles/src/main/res/values/bools.xml
@@ -3,5 +3,6 @@
 
     <!-- Created to detect what has to be implemented (especially in the settings) -->
     <bool name="false_not_implemented">false</bool>
+    <bool name="isDarkMode">false</bool>
 
-</resources>
\ No newline at end of file
+</resources>
diff --git a/library/ui-styles/src/main/res/values/colors.xml b/library/ui-styles/src/main/res/values/colors.xml
index d887e7774e..a5c24feee8 100644
--- a/library/ui-styles/src/main/res/values/colors.xml
+++ b/library/ui-styles/src/main/res/values/colors.xml
@@ -36,6 +36,8 @@
     <color name="android_status_bar_background_dark">@color/element_background_dark</color>
     <color name="android_navigation_bar_background_dark">@color/element_system_dark</color>
 
+    <color name="modal_background_color">#FFFFFF</color>
+
     <!-- Used for toolbar background -->
     <attr name="vctr_toolbar_background" format="color" />
 
diff --git a/vector/src/main/java/im/vector/app/core/platform/VectorBaseActivity.kt b/vector/src/main/java/im/vector/app/core/platform/VectorBaseActivity.kt
index 19a3302b2c..b9237dd06d 100644
--- a/vector/src/main/java/im/vector/app/core/platform/VectorBaseActivity.kt
+++ b/vector/src/main/java/im/vector/app/core/platform/VectorBaseActivity.kt
@@ -46,6 +46,7 @@ import androidx.viewbinding.ViewBinding
 import com.airbnb.mvrx.MavericksView
 import com.bumptech.glide.util.Util
 import com.google.android.material.appbar.MaterialToolbar
+import com.google.android.material.color.MaterialColors
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.snackbar.Snackbar
 import dagger.hilt.android.EntryPointAccessors
@@ -238,8 +239,9 @@ abstract class VectorBaseActivity<VB : ViewBinding> : AppCompatActivity(), Maver
 
         initUiAndData()
 
-        window.statusBarColor = ContextCompat.getColor(this, android.R.color.white)
-        window.navigationBarColor = ContextCompat.getColor(this, android.R.color.white)
+        val toolbarBackgroundRes = R.color.modal_background_color
+        window.statusBarColor = ContextCompat.getColor(this, toolbarBackgroundRes)
+        window.navigationBarColor = ContextCompat.getColor(this, toolbarBackgroundRes)
         val titleRes = getTitleRes()
         if (titleRes != -1) {
             supportActionBar?.let {
diff --git a/vector/src/main/res/drawable/bg_space_modal.xml b/vector/src/main/res/drawable/bg_space_modal.xml
index f6033a1f8c..847424087f 100644
--- a/vector/src/main/res/drawable/bg_space_modal.xml
+++ b/vector/src/main/res/drawable/bg_space_modal.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="#FFF"/>
+    <solid android:color="@color/modal_background_color"/>
     <corners
         android:bottomLeftRadius="12dp"
         android:bottomRightRadius="12dp" />
diff --git a/vector/src/main/res/layout/fragment_space_list_modal.xml b/vector/src/main/res/layout/fragment_space_list_modal.xml
index c561094a70..14f5f36919 100644
--- a/vector/src/main/res/layout/fragment_space_list_modal.xml
+++ b/vector/src/main/res/layout/fragment_space_list_modal.xml
@@ -56,7 +56,7 @@
         app:layout_constraintEnd_toEndOf="@id/add_space_icon_background"
         app:layout_constraintStart_toStartOf="@id/add_space_icon_background"
         app:layout_constraintTop_toTopOf="@id/add_space_icon_background"
-        app:tint="#000" />
+        app:tint="?attr/vctr_spoiler_background_color" />
 
     <TextView
         style="@style/Widget.Vector.TextView.Body.Medium"