diff --git a/app/src/main/res/layout/camera_controls_landscape.xml b/app/src/main/res/layout/camera_controls_landscape.xml
index 1d1979a89b6..42891d9f995 100644
--- a/app/src/main/res/layout/camera_controls_landscape.xml
+++ b/app/src/main/res/layout/camera_controls_landscape.xml
@@ -73,6 +73,7 @@
         android:layout_marginEnd="40dp"
         android:layout_marginBottom="36dp"
         android:background="@drawable/v2_media_count_indicator_background"
+        android:minHeight="44dp"
         android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/v2_media_gallery_fragment.xml b/app/src/main/res/layout/v2_media_gallery_fragment.xml
index 156806ebef2..ccae964ecf4 100644
--- a/app/src/main/res/layout/v2_media_gallery_fragment.xml
+++ b/app/src/main/res/layout/v2_media_gallery_fragment.xml
@@ -12,8 +12,8 @@
         android:layout_height="?attr/actionBarSize"
         android:background="@color/core_black"
         app:layout_constraintTop_toTopOf="parent"
-        app:navigationIcon="@drawable/ic_arrow_left_white_24"
         app:menu="@menu/v2_media_gallery_fragment_toolbar_menu"
+        app:navigationIcon="@drawable/ic_arrow_left_white_24"
         app:title="" />
 
     <androidx.recyclerview.widget.RecyclerView
@@ -53,9 +53,9 @@
         android:layout_width="53dp"
         android:layout_height="0dp"
         android:background="@drawable/persistent_fading_edge"
-        app:layout_constraintTop_toTopOf="@id/media_gallery_selected"
         app:layout_constraintBottom_toBottomOf="@id/media_gallery_selected"
-        app:layout_constraintEnd_toEndOf="@id/media_gallery_selected" />
+        app:layout_constraintEnd_toEndOf="@id/media_gallery_selected"
+        app:layout_constraintTop_toTopOf="@id/media_gallery_selected" />
 
     <org.thoughtcrime.securesms.mediasend.v2.MediaCountIndicatorButton
         android:id="@+id/media_gallery_count_button"
@@ -63,6 +63,7 @@
         android:layout_height="wrap_content"
         android:layout_marginEnd="16dp"
         android:background="@drawable/v2_media_count_indicator_background"
+        android:minHeight="44dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@id/media_gallery_selected"
diff --git a/app/src/main/res/layout/v2_media_review_fragment.xml b/app/src/main/res/layout/v2_media_review_fragment.xml
index 1494e49f5bb..3757926b640 100644
--- a/app/src/main/res/layout/v2_media_review_fragment.xml
+++ b/app/src/main/res/layout/v2_media_review_fragment.xml
@@ -269,7 +269,7 @@
             app:tint="@color/core_white"
             tools:translationY="0dp" />
 
-        <androidx.appcompat.widget.AppCompatImageView
+        e<androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/send"
             android:layout_width="36dp"
             android:layout_height="36dp"