diff --git a/app/src/main/res/layout/conversation_item_footer_incoming.xml b/app/src/main/res/layout/conversation_item_footer_incoming.xml
index 63e327a4a3..7243c19a98 100644
--- a/app/src/main/res/layout/conversation_item_footer_incoming.xml
+++ b/app/src/main/res/layout/conversation_item_footer_incoming.xml
@@ -4,8 +4,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    tools:layout_width="wrap_content"
     tools:background="@color/green"
+    tools:layout_width="wrap_content"
     tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout">
 
     <androidx.appcompat.widget.AppCompatTextView
@@ -85,8 +85,8 @@
         android:maxWidth="140dp"
         android:maxLines="1"
         android:visibility="gone"
-        app:layout_constraintStart_toEndOf="@id/date_and_expiry_wrapper"
         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" />
@@ -127,12 +127,14 @@
         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"
-        android:lineSpacingExtra="1sp"
         app:backgroundTint="@color/transparent_black_08"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/conversation_item_footer_outgoing.xml b/app/src/main/res/layout/conversation_item_footer_outgoing.xml
index 604d390910..cd3d556cbd 100644
--- a/app/src/main/res/layout/conversation_item_footer_outgoing.xml
+++ b/app/src/main/res/layout/conversation_item_footer_outgoing.xml
@@ -46,6 +46,8 @@
         android:lineSpacingExtra="1sp"
         android:minWidth="30dp"
         android:minHeight="20dp"
+        android:paddingStart="4dp"
+        android:paddingEnd="4dp"
         android:textAppearance="@style/TextAppearance.Signal.Subtitle"
         android:textColor="@color/core_white"
         android:visibility="gone"
diff --git a/app/src/main/res/layout/voice_note_player_view.xml b/app/src/main/res/layout/voice_note_player_view.xml
index 08c5ac8ae8..dff5c2e7a5 100644
--- a/app/src/main/res/layout/voice_note_player_view.xml
+++ b/app/src/main/res/layout/voice_note_player_view.xml
@@ -40,11 +40,14 @@
 
     <FrameLayout
         android:id="@+id/voice_note_player_speed_touch_target"
-        android:layout_width="36dp"
+        android:layout_width="wrap_content"
         android:layout_height="36dp"
         android:layout_marginEnd="8dp"
         android:background="?selectableItemBackground"
         android:contentDescription="@string/VoiceNotePlayerView__change_voice_message_speed"
+        android:minWidth="36dp"
+        android:paddingStart="4dp"
+        android:paddingEnd="4dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@id/voice_note_player_close"
         app:layout_constraintTop_toTopOf="parent">
@@ -60,6 +63,8 @@
             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"
             app:backgroundTint="@color/voice_note_player_speed_background_tint"