diff --git a/vector/src/main/res/layout/adapter_item_action_quick_reaction.xml b/vector/src/main/res/layout/adapter_item_action_quick_reaction.xml
index ba39f58c0f..fef7b0eeef 100644
--- a/vector/src/main/res/layout/adapter_item_action_quick_reaction.xml
+++ b/vector/src/main/res/layout/adapter_item_action_quick_reaction.xml
@@ -15,6 +15,7 @@
         android:background="?android:attr/selectableItemBackground"
         android:clickable="true"
         android:focusable="true"
+        android:textColor="@color/black"
         android:textSize="30sp"
         app:autoSizeTextType="uniform"
         app:layout_constraintBottom_toTopOf="@id/quick_react_agree_text"
@@ -34,10 +35,10 @@
         android:background="?android:attr/selectableItemBackground"
         android:clickable="true"
         android:focusable="true"
+        android:textColor="@color/black"
         android:textSize="30sp"
         app:autoSizeTextType="uniform"
         app:layout_constraintBottom_toBottomOf="@id/quick_react_1_text"
-
         app:layout_constraintEnd_toStartOf="@id/center_guideline"
         app:layout_constraintStart_toEndOf="@id/quick_react_1_text"
         app:layout_constraintTop_toTopOf="@id/quick_react_1_text"
@@ -73,6 +74,7 @@
         android:background="?android:attr/selectableItemBackground"
         android:clickable="true"
         android:focusable="true"
+        android:textColor="@color/black"
         android:textSize="30sp"
         app:autoSizeTextType="uniform"
         app:layout_constraintBottom_toBottomOf="@+id/quick_react_1_text"
@@ -91,6 +93,7 @@
         android:background="?android:attr/selectableItemBackground"
         android:clickable="true"
         android:focusable="true"
+        android:textColor="@color/black"
         android:textSize="30sp"
         app:autoSizeTextType="uniform"
         app:layout_constraintBottom_toBottomOf="@id/quick_react_3_text"
diff --git a/vector/src/main/res/layout/item_timeline_event_base.xml b/vector/src/main/res/layout/item_timeline_event_base.xml
index 806e18e33d..2ec5cf041a 100644
--- a/vector/src/main/res/layout/item_timeline_event_base.xml
+++ b/vector/src/main/res/layout/item_timeline_event_base.xml
@@ -85,6 +85,8 @@
         android:id="@+id/messageContentRedactedStub"
         style="@style/TimelineContentStubLayoutParams"
         android:layout_height="20dp"
+        android:layout_marginEnd="56dp"
+        android:layout_marginRight="56dp"
         android:layout="@layout/item_timeline_event_redacted_stub"
         tools:ignore="MissingConstraints" />
 
@@ -92,16 +94,16 @@
     <!-- TODO: For now we show 8 reactions maximum, this will need rework when needed-->
     <ViewStub
         android:id="@+id/messageBottomInfo"
-        android:inflatedId="@+id/messageBottomInfo"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:layout_marginBottom="4dp"
+        android:inflatedId="@+id/messageBottomInfo"
         android:layout="@layout/item_timeline_event_bottom_reactions_stub"
         android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@id/messageStartGuideline"
         app:layout_constraintVertical_chainStyle="packed"
-        android:layout_marginBottom="4dp"
         tools:visibility="visible">
 
     </ViewStub>
diff --git a/vector/src/main/res/layout/item_timeline_event_redacted_stub.xml b/vector/src/main/res/layout/item_timeline_event_redacted_stub.xml
index 948e6ea6d8..2f930577f0 100644
--- a/vector/src/main/res/layout/item_timeline_event_redacted_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_redacted_stub.xml
@@ -1,5 +1,4 @@
 <View xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="20dp"
-    android:background="@drawable/redacted_background"
-    />
\ No newline at end of file
+    android:background="@drawable/redacted_background" />
\ No newline at end of file
diff --git a/vector/src/main/res/layout/reaction_button.xml b/vector/src/main/res/layout/reaction_button.xml
index 8d66d98776..70b841bc9d 100644
--- a/vector/src/main/res/layout/reaction_button.xml
+++ b/vector/src/main/res/layout/reaction_button.xml
@@ -2,9 +2,9 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:clipChildren="false"
     android:layout_width="44dp"
-    android:layout_height="26dp">
+    android:layout_height="26dp"
+    android:clipChildren="false">
 
 
     <View
@@ -16,21 +16,21 @@
     <im.vector.riotredesign.features.reactions.widget.DotsView
         android:id="@+id/dots"
         android:layout_width="30dp"
-        android:clipChildren="false"
         android:layout_height="30dp"
+        android:clipChildren="false"
         app:layout_constraintBottom_toBottomOf="@+id/reactionText"
+        app:layout_constraintEnd_toEndOf="@+id/reactionText"
         app:layout_constraintStart_toStartOf="@+id/reactionText"
-        app:layout_constraintTop_toTopOf="@+id/reactionText"
-        app:layout_constraintEnd_toEndOf="@+id/reactionText"/>
+        app:layout_constraintTop_toTopOf="@+id/reactionText" />
 
     <im.vector.riotredesign.features.reactions.widget.CircleView
         android:id="@+id/circle"
         android:layout_width="14dp"
         android:layout_height="14dp"
         app:layout_constraintBottom_toBottomOf="@+id/reactionText"
+        app:layout_constraintEnd_toEndOf="@+id/reactionText"
         app:layout_constraintStart_toStartOf="@+id/reactionText"
-        app:layout_constraintTop_toTopOf="@+id/reactionText"
-        app:layout_constraintEnd_toEndOf="@+id/reactionText"/>
+        app:layout_constraintTop_toTopOf="@+id/reactionText" />
 
     <TextView
         android:id="@+id/reactionText"
@@ -40,11 +40,12 @@
         android:layout_marginStart="6dp"
         android:layout_marginLeft="6dp"
         android:gravity="center"
-        tools:text="👍"
+        android:textColor="@color/black"
         android:textSize="13sp"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"/>
+        tools:text="👍" />
 
     <TextView
         android:id="@+id/reactionCount"