diff --git a/vector/src/main/res/values/theme_black.xml b/vector/src/main/res/values/theme_black.xml
index adb676c549..6777db37bf 100644
--- a/vector/src/main/res/values/theme_black.xml
+++ b/vector/src/main/res/values/theme_black.xml
@@ -32,7 +32,7 @@
         <!-- We do not use color secondary, default will be colorPrimary values: It does not work so declare again the value -->
         <item name="colorSecondary">@color/riotx_accent</item>
         <item name="colorSecondaryVariant">@color/primary_color_dark_black</item>
-        <item name="colorOnSecondary">@color/riotx_text_primary_black</item>
+        <item name="colorOnSecondary">@color/white</item>
         <item name="colorError">@color/riotx_notice</item>
         <item name="colorOnError">#FFFFFF</item>
         <!--item name="colorSurface">#FFFFFF</item>
diff --git a/vector/src/main/res/values/theme_dark.xml b/vector/src/main/res/values/theme_dark.xml
index db46cce33d..9d1d23d65c 100644
--- a/vector/src/main/res/values/theme_dark.xml
+++ b/vector/src/main/res/values/theme_dark.xml
@@ -30,7 +30,7 @@
         <!-- We do not use color secondary, default will be colorPrimary values: It does not work so declare again the value -->
         <item name="colorSecondary">@color/riotx_accent</item>
         <item name="colorSecondaryVariant">@color/primary_color_dark_dark</item>
-        <item name="colorOnSecondary">@color/riotx_text_primary_dark</item>
+        <item name="colorOnSecondary">@color/white</item>
         <item name="colorError">@color/riotx_notice</item>
         <item name="colorOnError">#FFFFFF</item>
         <!--item name="colorSurface">#FFFFFF</item>
diff --git a/vector/src/main/res/values/theme_light.xml b/vector/src/main/res/values/theme_light.xml
index b1df7ac7ce..1cba608dab 100644
--- a/vector/src/main/res/values/theme_light.xml
+++ b/vector/src/main/res/values/theme_light.xml
@@ -27,10 +27,10 @@
         <item name="colorPrimary">@color/riotx_accent</item>
         <!--item name="colorPrimaryVariant">@color/primary_color_dark_light</item-->
         <item name="colorOnPrimary">@color/riotx_text_primary_light</item>
-        <!-- We do not use color secondary, default will be colorPrimary values-->
-        <!--item name="colorSecondary">@color/accent_color_light</item>
-        <item name="colorSecondaryVariant">#0039CB</item>
-        <item name="colorOnSecondary">@android:color/white</item-->
+        <!-- We do not use color secondary, default will be colorPrimary values: It does not work so declare again the value -->
+        <item name="colorSecondary">@color/riotx_accent</item>
+        <item name="colorSecondaryVariant">@color/primary_color_dark_light</item>
+        <item name="colorOnSecondary">@color/white</item>
         <item name="colorError">@color/riotx_notice</item>
         <item name="colorOnError">#FFFFFF</item>
         <!--item name="colorSurface">#FFFFFF</item>