diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/DonateToSignalFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/DonateToSignalFragment.kt
index bb82708d8f..88d2522f87 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/DonateToSignalFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/DonateToSignalFragment.kt
@@ -336,6 +336,8 @@ class DonateToSignalFragment :
           }
         )
       }
+
+      space(24.dp)
     }
   }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/payments/preferences/PaymentsHomeFragment.java b/app/src/main/java/org/thoughtcrime/securesms/payments/preferences/PaymentsHomeFragment.java
index 7106b84595..18d2409bf7 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/payments/preferences/PaymentsHomeFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/payments/preferences/PaymentsHomeFragment.java
@@ -12,7 +12,6 @@ import androidx.annotation.Nullable;
 import androidx.appcompat.widget.Toolbar;
 import androidx.compose.ui.platform.ComposeView;
 import androidx.core.content.ContextCompat;
-import androidx.lifecycle.FlowLiveDataConversions;
 import androidx.lifecycle.ViewModelProvider;
 import androidx.navigation.Navigation;
 import androidx.navigation.fragment.NavHostFragment;
@@ -27,7 +26,6 @@ import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.LoggingFragment;
 import org.thoughtcrime.securesms.PaymentPreferencesDirections;
 import org.thoughtcrime.securesms.R;
-import org.thoughtcrime.securesms.banner.Banner;
 import org.thoughtcrime.securesms.banner.BannerManager;
 import org.thoughtcrime.securesms.banner.banners.EnclaveFailureBanner;
 import org.thoughtcrime.securesms.components.settings.app.AppSettingsActivity;
@@ -47,12 +45,9 @@ import org.thoughtcrime.securesms.util.ViewUtil;
 import org.thoughtcrime.securesms.util.navigation.SafeNavigation;
 import org.thoughtcrime.securesms.util.views.Stub;
 
-import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
-import kotlinx.coroutines.flow.Flow;
-
 public class PaymentsHomeFragment extends LoggingFragment {
   private static final int DAYS_UNTIL_REPROMPT_PAYMENT_LOCK = 30;
   private static final int MAX_PAYMENT_LOCK_SKIP_COUNT      = 2;
diff --git a/app/src/main/res/layout/chat_wallpaper_fragment.xml b/app/src/main/res/layout/chat_wallpaper_fragment.xml
index 817389be44..4318bf0c54 100644
--- a/app/src/main/res/layout/chat_wallpaper_fragment.xml
+++ b/app/src/main/res/layout/chat_wallpaper_fragment.xml
@@ -102,10 +102,13 @@
                 android:layout_marginStart="4dp"
                 android:layout_marginEnd="4dp"
                 android:layout_marginBottom="4dp"
+                android:maxLines="1"
                 android:text="@string/ChatWallpaperFragment__contact_name"
                 android:textAppearance="@style/Signal.Text.Body"
                 android:textColor="@color/signal_text_primary"
                 android:textSize="8sp"
+                android:ellipsize="end"
+                app:layout_constraintTop_toTopOf="@id/chat_wallpaper_preview_top_bar_portrait"
                 app:layout_constraintBottom_toBottomOf="@id/chat_wallpaper_preview_top_bar"
                 app:layout_constraintEnd_toStartOf="@id/chat_wallpaper_preview_top_bar_video"
                 app:layout_constraintStart_toEndOf="@id/chat_wallpaper_preview_top_bar_portrait"
diff --git a/app/src/main/res/layout/conversation_requesting_bottom_banner.xml b/app/src/main/res/layout/conversation_requesting_bottom_banner.xml
index 693eb57ec1..69c2109a0c 100644
--- a/app/src/main/res/layout/conversation_requesting_bottom_banner.xml
+++ b/app/src/main/res/layout/conversation_requesting_bottom_banner.xml
@@ -25,6 +25,7 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
         android:layout_marginEnd="16dp"
+        android:layout_marginBottom="16dp"
         android:text="@string/ConversationActivity_cancel_request" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/donation_pill_toggle.xml b/app/src/main/res/layout/donation_pill_toggle.xml
index dc9654f15d..b3f753f767 100644
--- a/app/src/main/res/layout/donation_pill_toggle.xml
+++ b/app/src/main/res/layout/donation_pill_toggle.xml
@@ -6,23 +6,6 @@
     android:layout_height="wrap_content"
     android:paddingHorizontal="@dimen/dsl_settings_gutter">
 
-    <androidx.constraintlayout.widget.Barrier
-        android:id="@+id/start_barrier"
-        android:layout_width="0dp"
-        android:layout_height="match_parent"
-        app:barrierDirection="start"
-        app:constraint_referenced_ids="monthly_invis_start,one_time_invis_start"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <androidx.constraintlayout.widget.Barrier
-        android:id="@+id/end_barrier"
-        android:layout_width="0dp"
-        android:layout_height="match_parent"
-        app:barrierDirection="end"
-        app:constraint_referenced_ids="monthly_invis_end,one_time_invis_end" />
-
     <androidx.constraintlayout.widget.Guideline
         android:id="@+id/center_guide"
         android:layout_width="wrap_content"
@@ -30,34 +13,12 @@
         android:orientation="vertical"
         app:layout_constraintGuide_percent="0.5" />
 
-    <!-- Invisible Views -->
-
     <com.google.android.material.button.MaterialButton
-        android:id="@+id/monthly_invis_start"
-        style="@style/Signal.Widget.Button.Medium.Primary"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/DonationPillToggle__monthly"
-        android:textAppearance="@style/Signal.Text.LabelLarge"
-        android:textColor="@color/signal_colorOnSurface"
-        android:visibility="invisible"
-        app:backgroundTint="@color/donation_pill_toggle_background_tint"
-        app:icon="@drawable/ic_check_20"
-        app:iconGravity="textStart"
-        app:iconSize="20dp"
-        app:iconTint="@color/signal_colorOnSurface"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@id/center_guide"
-        app:layout_constraintHorizontal_bias="1"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Signal.DonationTogglePill.Start" />
-
-    <com.google.android.material.button.MaterialButton
-        android:id="@+id/one_time_invis_start"
+        android:id="@+id/one_time_start_invisible"
         style="@style/Signal.Widget.Button.Medium.Primary"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:maxWidth="@dimen/donation_pill_max_width"
         android:text="@string/DonationPillToggle__one_time"
         android:textAppearance="@style/Signal.Text.LabelLarge"
         android:textColor="@color/signal_colorOnSurface"
@@ -70,89 +31,67 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@id/center_guide"
         app:layout_constraintHorizontal_bias="1"
-        app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Signal.DonationTogglePill.Start" />
 
-    <com.google.android.material.button.MaterialButton
-        android:id="@+id/monthly_invis_end"
-        style="@style/Signal.Widget.Button.Medium.Primary"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/DonationPillToggle__monthly"
-        android:textAppearance="@style/Signal.Text.LabelLarge"
-        android:textColor="@color/signal_colorOnSurface"
-        android:visibility="invisible"
-        app:backgroundTint="@color/donation_pill_toggle_background_tint"
-        app:icon="@drawable/ic_check_20"
-        app:iconGravity="textStart"
-        app:iconSize="20dp"
-        app:iconTint="@color/signal_colorOnSurface"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0"
-        app:layout_constraintStart_toEndOf="@id/center_guide"
-        app:layout_constraintTop_toTopOf="parent"
-        app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Signal.DonationTogglePill.End" />
-
-    <com.google.android.material.button.MaterialButton
-        android:id="@+id/one_time_invis_end"
-        style="@style/Signal.Widget.Button.Medium.Primary"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/DonationPillToggle__one_time"
-        android:textAppearance="@style/Signal.Text.LabelLarge"
-        android:textColor="@color/signal_colorOnSurface"
-        android:visibility="invisible"
-        app:backgroundTint="@color/donation_pill_toggle_background_tint"
-        app:icon="@drawable/ic_check_20"
-        app:iconGravity="textStart"
-        app:iconSize="20dp"
-        app:iconTint="@color/signal_colorOnSurface"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0"
-        app:layout_constraintStart_toEndOf="@id/center_guide"
-        app:layout_constraintTop_toTopOf="parent"
-        app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Signal.DonationTogglePill.End" />
-
-    <!-- End invisible views -->
-
     <com.google.android.material.button.MaterialButton
         android:id="@+id/one_time"
         style="@style/Signal.Widget.Button.Medium.Primary"
         android:layout_width="0dp"
-        android:layout_height="wrap_content"
+        android:layout_height="0dp"
         android:text="@string/DonationPillToggle__one_time"
         android:textAppearance="@style/Signal.Text.LabelLarge"
         android:textColor="@color/signal_colorOnSurface"
         app:backgroundTint="@color/donation_pill_toggle_background_tint"
         app:iconGravity="textStart"
         app:iconSize="20dp"
+        android:visibility="visible"
         app:iconTint="@color/signal_colorOnSurface"
-        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintBottom_toBottomOf="@id/one_time_start_invisible"
         app:layout_constraintEnd_toStartOf="@id/center_guide"
-        app:layout_constraintStart_toEndOf="@id/start_barrier"
-        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintStart_toStartOf="@id/one_time_start_invisible"
+        app:layout_constraintTop_toTopOf="@id/one_time_start_invisible"
         app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Signal.DonationTogglePill.Start" />
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/monthly"
         style="@style/Signal.Widget.Button.Medium.Primary"
         android:layout_width="0dp"
-        android:layout_height="wrap_content"
+        android:layout_height="0dp"
         android:text="@string/DonationPillToggle__monthly"
         android:textAppearance="@style/Signal.Text.LabelLarge"
         android:textColor="@color/signal_colorOnSurface"
+        android:visibility="visible"
         app:backgroundTint="@color/donation_pill_toggle_background_tint"
         app:iconGravity="textStart"
         app:iconSize="20dp"
         app:iconTint="@color/signal_colorOnSurface"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@id/end_barrier"
+        app:layout_constraintBottom_toBottomOf="@id/one_time_start_invisible"
+        app:layout_constraintEnd_toEndOf="@id/monthly_end_invisible"
         app:layout_constraintStart_toEndOf="@id/center_guide"
-        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintTop_toTopOf="@id/one_time_start_invisible"
         app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Signal.DonationTogglePill.End"
         tools:icon="@drawable/ic_check_20" />
 
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/monthly_end_invisible"
+        style="@style/Signal.Widget.Button.Medium.Primary"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:maxWidth="@dimen/donation_pill_max_width"
+        android:text="@string/DonationPillToggle__monthly"
+        android:textAppearance="@style/Signal.Text.LabelLarge"
+        android:textColor="@color/signal_colorOnSurface"
+        android:visibility="invisible"
+        app:backgroundTint="@color/donation_pill_toggle_background_tint"
+        app:icon="@drawable/ic_check_20"
+        app:iconGravity="textStart"
+        app:iconSize="20dp"
+        app:iconTint="@color/signal_colorOnSurface"
+        app:layout_constraintBottom_toBottomOf="@id/one_time_start_invisible"
+        app:layout_constraintHorizontal_bias="0"
+        app:layout_constraintStart_toEndOf="@id/center_guide"
+        app:layout_constraintTop_toTopOf="@id/one_time_start_invisible"
+        app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Signal.DonationTogglePill.End" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/help_fragment.xml b/app/src/main/res/layout/help_fragment.xml
index 3af943574b..edf6802c3e 100644
--- a/app/src/main/res/layout/help_fragment.xml
+++ b/app/src/main/res/layout/help_fragment.xml
@@ -217,6 +217,7 @@
         android:paddingStart="16dp"
         android:paddingEnd="16dp"
         android:paddingVertical="8dp"
+        android:layout_marginBottom="16dp"
         android:text="@string/HelpFragment__have_you_read_our_faq_yet"
         android:textAllCaps="false"
         android:textAppearance="@style/Signal.Text.Body"
diff --git a/app/src/main/res/layout/payments_home_fragment.xml b/app/src/main/res/layout/payments_home_fragment.xml
index bc6c69dcae..45da33cc89 100644
--- a/app/src/main/res/layout/payments_home_fragment.xml
+++ b/app/src/main/res/layout/payments_home_fragment.xml
@@ -49,6 +49,8 @@
         android:layout_height="0dp"
         android:scrollIndicators="top|bottom"
         android:scrollbars="vertical"
+        android:paddingBottom="16dp"
+        android:clipToPadding="false"
         app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/values-land/dimens.xml b/app/src/main/res/values-land/dimens.xml
index 148bf0fdfa..7ac7050235 100644
--- a/app/src/main/res/values-land/dimens.xml
+++ b/app/src/main/res/values-land/dimens.xml
@@ -14,4 +14,6 @@
     <dimen name="CallScreenParticipantItem__margin_end">0dp</dimen>
     <dimen name="CallScreenParticipantItem__margin_bottom">4dp</dimen>
 
+    <dimen name="donation_pill_max_width">250dp</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 bbf04ff04d..c454c6e43a 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -252,4 +252,6 @@
     <dimen name="conversation_header_max_size">308dp</dimen>
     <dimen name="conversation_header_margin">40dp</dimen>
 
+    <dimen name="donation_pill_max_width">150dp</dimen>
+
 </resources>