diff --git a/vector/src/main/res/layout/item_group.xml b/vector/src/main/res/layout/item_group.xml
index 78f8a33f..a848ec5d 100644
--- a/vector/src/main/res/layout/item_group.xml
+++ b/vector/src/main/res/layout/item_group.xml
@@ -8,8 +8,7 @@
     android:background="@drawable/bg_group_item"
     android:clickable="true"
     android:focusable="true"
-    android:foreground="?attr/selectableItemBackground"
-    tools:background="#FAFAFA">
+    android:foreground="?attr/selectableItemBackground">
 
     <ImageView
         android:id="@+id/groupAvatarImageView"
@@ -32,7 +31,7 @@
         android:layout_marginEnd="@dimen/layout_horizontal_margin"
         android:ellipsize="end"
         android:maxLines="1"
-        android:textColor="?colorOnPrimary"
+        android:textColor="?riotx_text_primary"
         android:textSize="15sp"
         android:textStyle="bold"
         app:layout_constraintBottom_toTopOf="@+id/groupBottomSeparator"
@@ -48,6 +47,7 @@
         android:layout_marginEnd="21dp"
         android:layout_marginRight="21dp"
         android:src="@drawable/ic_arrow_right"
+        android:tint="?riotx_text_primary"
         app:layout_constraintBottom_toTopOf="@+id/groupBottomSeparator"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
@@ -56,7 +56,7 @@
         android:id="@+id/groupBottomSeparator"
         android:layout_width="0dp"
         android:layout_height="1dp"
-        android:background="#E9EDF1"
+        android:background="?riotx_header_panel_border_mobile"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent" />
diff --git a/vector/src/main/res/values/theme_light.xml b/vector/src/main/res/values/theme_light.xml
index 8cdd7a4c..00b4e873 100644
--- a/vector/src/main/res/values/theme_light.xml
+++ b/vector/src/main/res/values/theme_light.xml
@@ -4,36 +4,6 @@
     <!-- LIGHT THEME COLORS -->
 
     <style name="AppTheme.Base.Light" parent="Theme.MaterialComponents.Light.NoActionBar">
-        <!--item name="colorPrimary"></item>
-        <item name="colorPrimaryVariant"></item>
-        <item name="colorOnPrimary">@android:color/white</item-->
-
-        <item name="colorPrimary">@color/primary_color_light</item>
-        <item name="colorPrimaryVariant">@color/primary_color_dark_light</item>
-        <item name="colorOnPrimary">@color/riotx_text_primary_light</item>
-        <item name="colorSecondary">@color/accent_color_light</item>
-        <item name="colorSecondaryVariant">#0039CB</item>
-        <item name="colorOnSecondary">@android:color/white</item>
-        <item name="colorError">@color/riotx_notice</item>
-        <item name="colorOnError">#FFFFFF</item>
-        <item name="colorSurface">#FFFFFF</item>
-        <item name="colorOnSurface">#212121</item>
-        <item name="android:colorBackground">@color/riotx_background_light</item>
-        <item name="colorOnBackground">#212121</item>
-
-        <item name="colorAccent">@color/accent_color_light</item>
-
-        <item name="materialButtonStyle">@style/VectorButtonStyle</item>
-        <item name="toolbarStyle">@style/VectorToolbarStyle</item>
-        <item name="alertDialogTheme">@style/VectorAlertDialogStyle</item>
-
-
-        <!--item name="android:textColorPrimary">@color/black_87</item>
-        <item name="android:textColorSecondary">@color/black_38</item>
-        <item name="android:textColorTertiary">@color/black_37</item-->
-
-        <item name="android:textColorLink">@color/riotx_links</item>
-
         <!-- Riotx attribute for palette -->
         <item name="riotx_background">@color/riotx_background_light</item>
         <item name="riotx_base">@color/riotx_base_light</item>
@@ -53,6 +23,35 @@
         <item name="riotx_android_status_bar">@color/riotx_android_status_bar_light</item>
         <item name="riotx_line_break_mobile">@color/riotx_line_break_mobile_light</item>
 
+        <!-- Material color: Note: this block should be the same in all theme because it references only common colors and ?riotx attributes -->
+        <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>
+        <item name="colorSecondary">@color/accent_color_light</item>
+        <item name="colorSecondaryVariant">#0039CB</item>
+        <item name="colorOnSecondary">@android:color/white</item>
+        <item name="colorError">@color/riotx_notice</item>
+        <item name="colorOnError">#FFFFFF</item>
+        <item name="colorSurface">#FFFFFF</item>
+        <item name="colorOnSurface">#212121</item>
+        <item name="android:colorBackground">?riotx_background</item>
+        <item name="colorOnBackground">?riotx_text_primary</item>
+
+        <!-- TODO is it still required? -->
+        <item name="colorAccent">@color/accent_color_light</item>
+
+        <item name="materialButtonStyle">@style/VectorButtonStyle</item>
+        <item name="toolbarStyle">@style/VectorToolbarStyle</item>
+        <item name="alertDialogTheme">@style/VectorAlertDialogStyle</item>
+
+
+        <!--item name="android:textColorPrimary">@color/black_87</item>
+        <item name="android:textColorSecondary">@color/black_38</item>
+        <item name="android:textColorTertiary">@color/black_37</item-->
+
+        <item name="android:textColorLink">@color/riotx_links</item>
+
+
         <!-- Menu text color -->
         <!--item name="android:actionMenuTextColor">#FFFFFFFF</item-->