diff --git a/CHANGES.md b/CHANGES.md
index 69d793e479..6923b4437a 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -8,7 +8,7 @@ Improvements 🙌:
  -
 
 Bugfix 🐛:
- -
+ - Timeline : Fix ripple effect on text item and fix background color of separators.
 
 Translations 🗣:
  -
diff --git a/vector/src/main/res/layout/item_timeline_event_day_separator.xml b/vector/src/main/res/layout/item_timeline_event_day_separator.xml
index 74cc63e5be..a721864e5b 100644
--- a/vector/src/main/res/layout/item_timeline_event_day_separator.xml
+++ b/vector/src/main/res/layout/item_timeline_event_day_separator.xml
@@ -3,7 +3,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="?riotx_background"
     android:padding="8dp">
 
     <View
@@ -12,16 +11,16 @@
         android:layout_gravity="center_vertical"
         android:layout_marginStart="8dp"
         android:layout_marginEnd="8dp"
-        android:background="?riotx_header_panel_background" />
+        android:background="?riotx_list_bottom_sheet_divider_color" />
 
     <TextView
         android:id="@+id/itemDayTextView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
-        android:background="?riotx_background"
-        android:paddingStart="32dp"
-        android:paddingEnd="32dp"
+        android:background="?android:attr/windowBackground"
+        android:paddingStart="24dp"
+        android:paddingEnd="24dp"
         android:textColor="?riotx_header_panel_text_secondary"
         android:textSize="15sp"
         tools:text="@tools:sample/date/day_of_week" />
diff --git a/vector/src/main/res/layout/item_timeline_event_text_message_stub.xml b/vector/src/main/res/layout/item_timeline_event_text_message_stub.xml
index 7bdd0dd1e3..42cf24d027 100644
--- a/vector/src/main/res/layout/item_timeline_event_text_message_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_text_message_stub.xml
@@ -3,6 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:addStatesFromChildren="true"
     android:orientation="vertical">
 
     <TextView
diff --git a/vector/src/main/res/layout/item_timeline_read_marker.xml b/vector/src/main/res/layout/item_timeline_read_marker.xml
index e76ffa3d5c..5ce388c90b 100644
--- a/vector/src/main/res/layout/item_timeline_read_marker.xml
+++ b/vector/src/main/res/layout/item_timeline_read_marker.xml
@@ -2,7 +2,6 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="?riotx_background"
     android:padding="8dp">
 
     <View
@@ -17,10 +16,10 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
-        android:background="?riotx_background"
+        android:background="?android:attr/windowBackground"
         android:fontFamily="sans-serif-medium"
-        android:paddingStart="8dp"
-        android:paddingEnd="8dp"
+        android:paddingStart="16dp"
+        android:paddingEnd="16dp"
         android:text="@string/timeline_unread_messages"
         android:textColor="@color/notification_accent_color"
         android:textSize="15sp" />