diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/ConversationItemFooter.java b/app/src/main/java/org/thoughtcrime/securesms/components/ConversationItemFooter.java
index e78fadea06..c9f7eb24ed 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/ConversationItemFooter.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/ConversationItemFooter.java
@@ -18,6 +18,7 @@ import androidx.annotation.DrawableRes;
 import androidx.annotation.LayoutRes;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.appcompat.content.res.AppCompatResources;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.constraintlayout.widget.ConstraintSet;
 
@@ -60,7 +61,6 @@ public class ConversationItemFooter extends ConstraintLayout {
   private TextView                    audioDuration;
   private LottieAnimationView         revealDot;
   private PlaybackSpeedToggleTextView playbackSpeedToggleTextView;
-  private boolean                     isOutgoing;
   private boolean                     hasShrunkDate;
 
   private OnTouchDelegateChangedListener onTouchDelegateChangedListener;
@@ -93,22 +93,7 @@ public class ConversationItemFooter extends ConstraintLayout {
       typedArray = null;
     }
 
-    final @LayoutRes int contentId;
-    if (typedArray != null) {
-      int mode = typedArray.getInt(R.styleable.ConversationItemFooter_footer_mode, 0);
-      isOutgoing = mode == 0;
-
-      if (isOutgoing) {
-        contentId = R.layout.conversation_item_footer_outgoing;
-      } else {
-        contentId = R.layout.conversation_item_footer_incoming;
-      }
-    } else {
-      contentId  = R.layout.conversation_item_footer_outgoing;
-      isOutgoing = true;
-    }
-
-    inflate(getContext(), contentId, this);
+    inflate(getContext(), R.layout.conversation_item_footer, this);
 
     dateView                    = findViewById(R.id.footer_date);
     simView                     = findViewById(R.id.footer_sim_info);
@@ -120,6 +105,16 @@ public class ConversationItemFooter extends ConstraintLayout {
     playbackSpeedToggleTextView = findViewById(R.id.footer_audio_playback_speed_toggle);
 
     if (typedArray != null) {
+      int     mode       = typedArray.getInt(R.styleable.ConversationItemFooter_footer_mode, 0);
+      boolean isOutgoing = mode == 0;
+      if (isOutgoing) {
+        playbackSpeedToggleTextView.setTextColor(getResources().getColor(R.color.core_white));
+        playbackSpeedToggleTextView.setBackgroundTintList(AppCompatResources.getColorStateList(getContext(), R.color.transparent_white_20));
+      } else {
+        playbackSpeedToggleTextView.setTextColor(getResources().getColor(R.color.signal_text_secondary));
+        playbackSpeedToggleTextView.setBackgroundTintList(AppCompatResources.getColorStateList(getContext(), R.color.transparent_black_08));
+      }
+
       setTextColor(typedArray.getInt(R.styleable.ConversationItemFooter_footer_text_color, getResources().getColor(R.color.core_white)));
       setIconColor(typedArray.getInt(R.styleable.ConversationItemFooter_footer_icon_color, getResources().getColor(R.color.core_white)));
       setRevealDotColor(typedArray.getInt(R.styleable.ConversationItemFooter_footer_reveal_dot_color, getResources().getColor(R.color.core_white)));
@@ -247,14 +242,7 @@ public class ConversationItemFooter extends ConstraintLayout {
                                  }
                                });
 
-    if (isOutgoing) {
       dateView.setMaxWidth(ViewUtil.dpToPx(32));
-    } else {
-      ConstraintSet constraintSet = new ConstraintSet();
-      constraintSet.clone(this);
-      constraintSet.constrainMaxWidth(R.id.date_and_expiry_wrapper, ViewUtil.dpToPx(40));
-      constraintSet.applyTo(this);
-    }
   }
 
   private void hidePlaybackSpeedToggle() {
@@ -276,14 +264,7 @@ public class ConversationItemFooter extends ConstraintLayout {
                                  }
                                });
 
-    if (isOutgoing) {
       dateView.setMaxWidth(Integer.MAX_VALUE);
-    } else {
-      ConstraintSet constraintSet = new ConstraintSet();
-      constraintSet.clone(this);
-      constraintSet.constrainMaxWidth(R.id.date_and_expiry_wrapper, -1);
-      constraintSet.applyTo(this);
-    }
   }
 
   private @NonNull Rect getPlaybackSpeedToggleTouchDelegateRect() {
diff --git a/app/src/main/res/layout/conversation_item_footer_outgoing.xml b/app/src/main/res/layout/conversation_item_footer.xml
similarity index 94%
rename from app/src/main/res/layout/conversation_item_footer_outgoing.xml
rename to app/src/main/res/layout/conversation_item_footer.xml
index 47742a3515..1306dfe017 100644
--- a/app/src/main/res/layout/conversation_item_footer_outgoing.xml
+++ b/app/src/main/res/layout/conversation_item_footer.xml
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:gravity="center_vertical|end"
     android:orientation="horizontal"
     tools:background="@color/green_500"
-    tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout">
+    tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout"
+    tools:viewBindingIgnore="true">
 
     <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/footer_audio_duration"
         style="@style/Signal.Text.Caption.MessageSent"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/message_audio_duration_margin_start"
+        android:layout_marginStart="8dp"
         android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -55,6 +55,8 @@
         app:backgroundTint="@color/transparent_white_20"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@id/footer_date"
+        app:layout_constraintHorizontal_bias="0.0"
+        app:layout_constraintStart_toEndOf="@id/footer_revealed_dot"
         app:layout_constraintTop_toTopOf="parent"
         tools:alpha="1"
         tools:text="1x"
@@ -74,7 +76,7 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@id/footer_expiration_timer"
         app:layout_constraintTop_toTopOf="parent"
-        tools:text="30m" />
+        tools:text="13:14pm" />
 
     <org.thoughtcrime.securesms.components.ExpirationTimerView
         android:id="@+id/footer_expiration_timer"
@@ -129,6 +131,7 @@
         android:layout_gravity="center_vertical"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="parent"
+        tools:visibility="visible" />
 
 </merge>
diff --git a/app/src/main/res/layout/conversation_item_footer_incoming.xml b/app/src/main/res/layout/conversation_item_footer_incoming.xml
deleted file mode 100644
index 3870cb1944..0000000000
--- a/app/src/main/res/layout/conversation_item_footer_incoming.xml
+++ /dev/null
@@ -1,147 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    tools:viewBindingIgnore="true"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    tools:background="@color/green_500"
-    tools:layout_width="wrap_content"
-    tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout">
-
-    <androidx.appcompat.widget.AppCompatTextView
-        android:id="@+id/footer_audio_duration"
-        style="@style/Signal.Text.Caption.MessageSent"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:visibility="gone"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:text="0:00"
-        tools:visibility="visible" />
-
-    <com.airbnb.lottie.LottieAnimationView
-        android:id="@+id/footer_revealed_dot"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:visibility="gone"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@id/footer_audio_duration"
-        app:layout_constraintTop_toTopOf="parent"
-        app:lottie_rawRes="@raw/lottie_played"
-        tools:visibility="visible" />
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/date_and_expiry_wrapper"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
-
-        <TextView
-            android:id="@+id/footer_date"
-            style="@style/Signal.Text.Caption.MessageSent"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:autoLink="none"
-            android:ellipsize="end"
-            android:linksClickable="false"
-            android:maxLines="1"
-            android:textColor="@color/signal_text_secondary"
-            app:layout_constrainedWidth="true"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toStartOf="@id/footer_expiration_timer"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            tools:text="13:14pm" />
-
-        <org.thoughtcrime.securesms.components.ExpirationTimerView
-            android:id="@+id/footer_expiration_timer"
-            android:layout_width="12dp"
-            android:layout_height="12dp"
-            android:layout_gravity="center_vertical"
-            android:layout_marginStart="4dp"
-            android:visibility="gone"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@id/footer_date"
-            app:layout_constraintTop_toTopOf="parent"
-            tools:visibility="visible" />
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-    <TextView
-        android:id="@+id/footer_sim_info"
-        style="@style/Signal.Text.Caption.MessageSent"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:layout_marginStart="4dp"
-        android:autoLink="none"
-        android:ellipsize="end"
-        android:fontFamily="sans-serif-light"
-        android:linksClickable="false"
-        android:maxWidth="140dp"
-        android:maxLines="1"
-        android:visibility="gone"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toEndOf="@id/date_and_expiry_wrapper"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:text="Sim Op"
-        tools:visibility="visible" />
-
-    <ImageView
-        android:id="@+id/footer_insecure_indicator"
-        android:layout_width="12dp"
-        android:layout_height="11dp"
-        android:layout_gravity="center_vertical"
-        android:layout_marginStart="4dp"
-        android:contentDescription="@string/conversation_item__secure_message_description"
-        android:src="@drawable/ic_unlocked_white_18dp"
-        android:visibility="gone"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toEndOf="@id/footer_sim_info"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:visibility="visible" />
-
-    <org.thoughtcrime.securesms.components.DeliveryStatusView
-        android:id="@+id/footer_delivery_status"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:layout_gravity="center_vertical"
-        android:layout_marginEnd="10dp"
-        android:visibility="gone"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:visibility="visible" />
-
-    <org.thoughtcrime.securesms.components.PlaybackSpeedToggleTextView
-        android:id="@+id/footer_audio_playback_speed_toggle"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="56dp"
-        android:layout_marginEnd="16dp"
-        android:alpha="0"
-        android:background="@drawable/round_background"
-        android:fontFamily="sans-serif-medium"
-        android:gravity="center"
-        android:lineSpacingExtra="1sp"
-        android:minWidth="30dp"
-        android:minHeight="20dp"
-        android:paddingStart="4dp"
-        android:paddingEnd="4dp"
-        android:textAppearance="@style/TextAppearance.Signal.Subtitle"
-        android:textColor="@color/signal_text_secondary"
-        android:visibility="gone"
-        app:backgroundTint="@color/transparent_black_08"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:alpha="1"
-        tools:text="1x"
-        tools:visibility="visible" />
-
-</merge>
diff --git a/app/src/main/res/values-ldrtl/dimens.xml b/app/src/main/res/values-ldrtl/dimens.xml
deleted file mode 100644
index bd782767a9..0000000000
--- a/app/src/main/res/values-ldrtl/dimens.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <dimen name="message_audio_duration_margin_start">0dp</dimen>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 0528843096..cb738577e8 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -61,7 +61,6 @@
     <dimen name="media_bubble_gif_width">240dp</dimen>
     <dimen name="message_audio_width">212dp</dimen>
     <dimen name="message_bubble_default_footer_bottom_margin">-4dp</dimen>
-    <dimen name="message_audio_duration_margin_start">56dp</dimen>
 
     <dimen name="progress_dialog_size">120dp</dimen>