diff --git a/app/src/main/java/org/thoughtcrime/securesms/badges/Badges.kt b/app/src/main/java/org/thoughtcrime/securesms/badges/Badges.kt
index f19aac8555..9223028792 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/badges/Badges.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/badges/Badges.kt
@@ -12,6 +12,7 @@ import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.badges.models.Badge
 import org.thoughtcrime.securesms.badges.models.Badge.Category.Companion.fromCode
 import org.thoughtcrime.securesms.components.settings.DSLConfiguration
+import org.thoughtcrime.securesms.database.model.databaseprotos.BadgeList
 import org.thoughtcrime.securesms.util.ScreenDensity
 import org.whispersystems.libsignal.util.Pair
 import org.whispersystems.signalservice.api.profiles.SignalServiceProfile
@@ -59,8 +60,7 @@ object Badges {
   }
 
   private fun getBestBadgeImageUriForDevice(serviceBadge: SignalServiceProfile.Badge): Pair<Uri, String> {
-    val bestDensity = ScreenDensity.getBestDensityBucketForDevice()
-    return when (bestDensity) {
+    return when (ScreenDensity.getBestDensityBucketForDevice()) {
       "ldpi" -> Pair(getBadgeImageUri(serviceBadge.sprites6[0]), "ldpi")
       "mdpi" -> Pair(getBadgeImageUri(serviceBadge.sprites6[1]), "mdpi")
       "hdpi" -> Pair(getBadgeImageUri(serviceBadge.sprites6[2]), "hdpi")
@@ -74,6 +74,34 @@ object Badges {
     return Timestamp(bigDecimal.toLong() * 1000).time
   }
 
+  @JvmStatic
+  fun fromDatabaseBadge(badge: BadgeList.Badge): Badge {
+    return Badge(
+      badge.id,
+      fromCode(badge.category),
+      badge.name,
+      badge.description,
+      Uri.parse(badge.imageUrl),
+      badge.imageDensity,
+      badge.expiration,
+      badge.visible
+    )
+  }
+
+  @JvmStatic
+  fun toDatabaseBadge(badge: Badge): BadgeList.Badge {
+    return BadgeList.Badge.newBuilder()
+      .setId(badge.id)
+      .setCategory(badge.category.code)
+      .setDescription(badge.description)
+      .setExpiration(badge.expirationTimestamp)
+      .setVisible(badge.visible)
+      .setName(badge.name)
+      .setImageUrl(badge.imageUrl.toString())
+      .setImageDensity(badge.imageDensity)
+      .build()
+  }
+
   @JvmStatic
   fun fromServiceBadge(serviceBadge: SignalServiceProfile.Badge): Badge {
     val uriAndDensity: Pair<Uri, String> = getBestBadgeImageUriForDevice(serviceBadge)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/badges/models/Badge.kt b/app/src/main/java/org/thoughtcrime/securesms/badges/models/Badge.kt
index 3e35a1b0df..0c7315a6cc 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/badges/models/Badge.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/badges/models/Badge.kt
@@ -37,6 +37,7 @@ data class Badge(
 ) : Parcelable, Key {
 
   fun isExpired(): Boolean = expirationTimestamp < System.currentTimeMillis()
+  fun isBoost(): Boolean = id == BOOST_BADGE_ID
 
   override fun updateDiskCacheKey(messageDigest: MessageDigest) {
     messageDigest.update(id.toByteArray(Key.CHARSET))
@@ -159,6 +160,8 @@ data class Badge(
   }
 
   companion object {
+    const val BOOST_BADGE_ID = "BOOST"
+
     private val SELECTION_CHANGED = Any()
 
     fun register(mappingAdapter: MappingAdapter, onBadgeClicked: OnBadgeClicked) {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/badges/self/expired/ExpiredBadgeBottomSheetDialogFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/badges/self/expired/ExpiredBadgeBottomSheetDialogFragment.kt
index 6b727365d3..2e4f248875 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/badges/self/expired/ExpiredBadgeBottomSheetDialogFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/badges/self/expired/ExpiredBadgeBottomSheetDialogFragment.kt
@@ -1,14 +1,17 @@
 package org.thoughtcrime.securesms.badges.self.expired
 
+import androidx.fragment.app.FragmentManager
 import androidx.navigation.fragment.findNavController
 import org.signal.core.util.DimensionUnit
 import org.thoughtcrime.securesms.R
+import org.thoughtcrime.securesms.badges.models.Badge
 import org.thoughtcrime.securesms.badges.models.ExpiredBadge
 import org.thoughtcrime.securesms.components.settings.DSLConfiguration
 import org.thoughtcrime.securesms.components.settings.DSLSettingsAdapter
 import org.thoughtcrime.securesms.components.settings.DSLSettingsBottomSheetFragment
 import org.thoughtcrime.securesms.components.settings.DSLSettingsText
 import org.thoughtcrime.securesms.components.settings.configure
+import org.thoughtcrime.securesms.util.BottomSheetUtil
 
 /**
  * Bottom sheet displaying a fading badge with a notice and action for becoming a subscriber again.
@@ -28,13 +31,23 @@ class ExpiredBadgeBottomSheetDialogFragment : DSLSettingsBottomSheetFragment(
     return configure {
       customPref(ExpiredBadge.Model(badge))
 
-      sectionHeaderPref(R.string.ExpiredBadgeBottomSheetDialogFragment__your_badge_has_expired)
+      sectionHeaderPref(
+        if (badge.isBoost()) {
+          R.string.ExpiredBadgeBottomSheetDialogFragment__your_badge_has_expired
+        } else {
+          R.string.ExpiredBadgeBottomSheetDialogFragment__your_subscription_was_cancelled
+        }
+      )
 
       space(DimensionUnit.DP.toPixels(4f).toInt())
 
       noPadTextPref(
         DSLSettingsText.from(
-          getString(R.string.ExpiredBadgeBottomSheetDialogFragment__your_s_badge_has_expired, badge.name),
+          if (badge.isBoost()) {
+            getString(R.string.ExpiredBadgeBottomSheetDialogFragment__your_s_badge_has_expired, badge.name)
+          } else {
+            getString(R.string.ExpiredBadgeBottomSheetDialogFragment__because)
+          },
           DSLSettingsText.CenterModifier
         )
       )
@@ -43,7 +56,11 @@ class ExpiredBadgeBottomSheetDialogFragment : DSLSettingsBottomSheetFragment(
 
       noPadTextPref(
         DSLSettingsText.from(
-          R.string.ExpiredBadgeBottomSheetDialogFragment__to_continue_supporting,
+          if (badge.isBoost()) {
+            R.string.ExpiredBadgeBottomSheetDialogFragment__to_continue_supporting
+          } else {
+            R.string.ExpiredBadgeBottomSheetDialogFragment__to_continue_supporting_signal
+          },
           DSLSettingsText.CenterModifier
         )
       )
@@ -51,7 +68,13 @@ class ExpiredBadgeBottomSheetDialogFragment : DSLSettingsBottomSheetFragment(
       space(DimensionUnit.DP.toPixels(92f).toInt())
 
       primaryButton(
-        text = DSLSettingsText.from(R.string.ExpiredBadgeBottomSheetDialogFragment__become_a_subscriber),
+        text = DSLSettingsText.from(
+          if (badge.isBoost()) {
+            R.string.ExpiredBadgeBottomSheetDialogFragment__become_a_subscriber
+          } else {
+            R.string.ExpiredBadgeBottomSheetDialogFragment__renew_subscription
+          }
+        ),
         onClick = {
           dismiss()
           findNavController().navigate(R.id.action_directly_to_subscribe)
@@ -66,4 +89,15 @@ class ExpiredBadgeBottomSheetDialogFragment : DSLSettingsBottomSheetFragment(
       )
     }
   }
+
+  companion object {
+    @JvmStatic
+    fun show(badge: Badge, fragmentManager: FragmentManager) {
+      val args = ExpiredBadgeBottomSheetDialogFragmentArgs.Builder(badge).build()
+      val fragment = ExpiredBadgeBottomSheetDialogFragment()
+      fragment.arguments = args.toBundle()
+
+      fragment.show(fragmentManager, BottomSheetUtil.STANDARD_BOTTOM_SHEET_FRAGMENT_TAG)
+    }
+  }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/badges/view/ViewBadgeBottomSheetDialogFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/badges/view/ViewBadgeBottomSheetDialogFragment.kt
index bf408cb044..f139377164 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/badges/view/ViewBadgeBottomSheetDialogFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/badges/view/ViewBadgeBottomSheetDialogFragment.kt
@@ -4,6 +4,7 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.core.content.ContextCompat
 import androidx.fragment.app.FragmentManager
 import androidx.fragment.app.viewModels
 import androidx.viewpager2.widget.ViewPager2
@@ -15,10 +16,13 @@ import org.thoughtcrime.securesms.badges.BadgeRepository
 import org.thoughtcrime.securesms.badges.models.Badge
 import org.thoughtcrime.securesms.badges.models.LargeBadge
 import org.thoughtcrime.securesms.components.FixedRoundedCornerBottomSheetDialogFragment
+import org.thoughtcrime.securesms.components.settings.app.AppSettingsActivity
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.recipients.RecipientId
 import org.thoughtcrime.securesms.util.BottomSheetUtil
+import org.thoughtcrime.securesms.util.CommunicationActions
 import org.thoughtcrime.securesms.util.MappingAdapter
+import org.thoughtcrime.securesms.util.PlayServicesUtil
 import org.thoughtcrime.securesms.util.visible
 
 class ViewBadgeBottomSheetDialogFragment : FixedRoundedCornerBottomSheetDialogFragment() {
@@ -37,11 +41,25 @@ class ViewBadgeBottomSheetDialogFragment : FixedRoundedCornerBottomSheetDialogFr
     val pager: ViewPager2 = view.findViewById(R.id.pager)
     val tabs: TabLayout = view.findViewById(R.id.tab_layout)
     val action: MaterialButton = view.findViewById(R.id.action)
+    val noSupport: View = view.findViewById(R.id.no_support)
 
     if (getRecipientId() == Recipient.self().id) {
       action.visible = false
     }
 
+    if (PlayServicesUtil.getPlayServicesStatus(requireContext()) != PlayServicesUtil.PlayServicesStatus.SUCCESS) {
+      noSupport.visible = true
+      action.icon = ContextCompat.getDrawable(requireContext(), R.drawable.ic_open_20)
+      action.setText(R.string.preferences__donate_to_signal)
+      action.setOnClickListener {
+        CommunicationActions.openBrowserLink(requireContext(), getString(R.string.donate_url))
+      }
+    } else {
+      action.setOnClickListener {
+        startActivity(AppSettingsActivity.subscriptions(requireContext()))
+      }
+    }
+
     val adapter = MappingAdapter()
 
     LargeBadge.register(adapter)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/DSLSettingsText.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/DSLSettingsText.kt
index 6f80910125..f707975edb 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/DSLSettingsText.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/DSLSettingsText.kt
@@ -70,4 +70,10 @@ sealed class DSLSettingsText {
       return SpanUtil.textAppearance(context, textAppearance, charSequence)
     }
   }
+
+  object BoldModifier : Modifier {
+    override fun modify(context: Context, charSequence: CharSequence): CharSequence {
+      return SpanUtil.bold(charSequence)
+    }
+  }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/AppSettingsFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/AppSettingsFragment.kt
index 3e79628c3e..e4439b21ab 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/AppSettingsFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/AppSettingsFragment.kt
@@ -24,6 +24,7 @@ import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.util.FeatureFlags
 import org.thoughtcrime.securesms.util.MappingAdapter
 import org.thoughtcrime.securesms.util.MappingViewHolder
+import org.thoughtcrime.securesms.util.PlayServicesUtil
 
 class AppSettingsFragment : DSLSettingsFragment(R.string.text_secure_normal__menu_settings) {
 
@@ -143,7 +144,7 @@ class AppSettingsFragment : DSLSettingsFragment(R.string.text_secure_normal__men
         }
       )
 
-      if (FeatureFlags.donorBadges()) {
+      if (FeatureFlags.donorBadges() && PlayServicesUtil.getPlayServicesStatus(requireContext()) == PlayServicesUtil.PlayServicesStatus.SUCCESS) {
         customPref(
           SubscriptionPreference(
             title = DSLSettingsText.from(R.string.preferences__subscription),
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/DonationPaymentRepository.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/DonationPaymentRepository.kt
index 641fdcf381..2e69789544 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/DonationPaymentRepository.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/DonationPaymentRepository.kt
@@ -106,15 +106,10 @@ class DonationPaymentRepository(activity: Activity) : StripeApi.PaymentIntentFet
     return Completable.create {
       stripeApi.confirmPaymentIntent(GooglePayPaymentSource(paymentData), paymentIntent).blockingSubscribe()
 
-      val jobIds = BoostReceiptRequestResponseJob.enqueueChain(paymentIntent)
-      val countDownLatch = CountDownLatch(2)
+      val jobId = BoostReceiptRequestResponseJob.enqueueChain(paymentIntent)
+      val countDownLatch = CountDownLatch(1)
 
-      ApplicationDependencies.getJobManager().addListener(jobIds.first()) { _, jobState ->
-        if (jobState.isComplete) {
-          countDownLatch.countDown()
-        }
-      }
-      ApplicationDependencies.getJobManager().addListener(jobIds.second()) { _, jobState ->
+      ApplicationDependencies.getJobManager().addListener(jobId) { _, jobState ->
         if (jobState.isComplete) {
           countDownLatch.countDown()
         }
@@ -146,15 +141,10 @@ class DonationPaymentRepository(activity: Activity) : StripeApi.PaymentIntentFet
           SignalStore.donationsValues().clearLevelOperation(levelUpdateOperation)
           it.onComplete()
         }.andThen {
-          val jobIds = SubscriptionReceiptRequestResponseJob.enqueueSubscriptionContinuation()
-          val countDownLatch = CountDownLatch(2)
+          val jobId = SubscriptionReceiptRequestResponseJob.enqueueSubscriptionContinuation()
+          val countDownLatch = CountDownLatch(1)
 
-          ApplicationDependencies.getJobManager().addListener(jobIds.first()) { _, jobState ->
-            if (jobState.isComplete) {
-              countDownLatch.countDown()
-            }
-          }
-          ApplicationDependencies.getJobManager().addListener(jobIds.second()) { _, jobState ->
+          ApplicationDependencies.getJobManager().addListener(jobId) { _, jobState ->
             if (jobState.isComplete) {
               countDownLatch.countDown()
             }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/boost/Boost.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/boost/Boost.kt
index 0d5cb9ea9f..a2127d5831 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/boost/Boost.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/boost/Boost.kt
@@ -119,6 +119,9 @@ data class Boost(
 
       if (model.isCustomAmountFocused && !custom.hasFocus()) {
         ViewUtil.focusAndShowKeyboard(custom)
+      } else if (!model.isCustomAmountFocused && custom.hasFocus()) {
+        ViewUtil.hideKeyboard(context, custom)
+        custom.clearFocus()
       }
     }
   }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/boost/BoostFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/boost/BoostFragment.kt
index b9725dbbab..d7d5192723 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/boost/BoostFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/boost/BoostFragment.kt
@@ -146,7 +146,7 @@ class BoostFragment : DSLSettingsBottomSheetFragment(
         text = DSLSettingsText.from(R.string.SubscribeFragment__more_payment_options),
         icon = DSLSettingsIcon.from(R.drawable.ic_open_20, R.color.signal_accent_primary),
         onClick = {
-          // TODO
+          // TODO [alex] -- Where's this go?
         }
       )
     }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/currency/SetCurrencyFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/currency/SetCurrencyFragment.kt
index c7569f2a9c..7e44d6c960 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/currency/SetCurrencyFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/currency/SetCurrencyFragment.kt
@@ -28,12 +28,12 @@ class SetCurrencyFragment : DSLSettingsBottomSheetFragment() {
   private fun getConfiguration(state: SetCurrencyState): DSLConfiguration {
     return configure {
       state.currencies.forEach { currency ->
-        radioPref(
+        clickPref(
           title = DSLSettingsText.from(currency.getDisplayName(Locale.getDefault())),
           summary = DSLSettingsText.from(currency.currencyCode),
-          isChecked = currency.currencyCode == state.selectedCurrencyCode,
           onClick = {
             viewModel.setSelectedCurrency(currency.currencyCode)
+            dismissAllowingStateLoss()
           }
         )
       }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/currency/SetCurrencyViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/currency/SetCurrencyViewModel.kt
index b36497b0cf..7f452b37a4 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/currency/SetCurrencyViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/currency/SetCurrencyViewModel.kt
@@ -7,7 +7,10 @@ import androidx.lifecycle.ViewModelProvider
 import org.signal.donations.StripeApi
 import org.thoughtcrime.securesms.BuildConfig
 import org.thoughtcrime.securesms.keyvalue.SignalStore
+import org.thoughtcrime.securesms.storage.StorageSyncHelper
+import org.thoughtcrime.securesms.subscription.Subscriber
 import org.thoughtcrime.securesms.util.livedata.Store
+import org.whispersystems.signalservice.api.subscriptions.SubscriberId
 import java.util.Currency
 import java.util.Locale
 
@@ -43,7 +46,21 @@ class SetCurrencyViewModel(private val isBoost: Boolean) : ViewModel() {
     if (isBoost) {
       SignalStore.donationsValues().setBoostCurrency(Currency.getInstance(selectedCurrencyCode))
     } else {
-      SignalStore.donationsValues().setSubscriptionCurrency(Currency.getInstance(selectedCurrencyCode))
+      val currency = Currency.getInstance(selectedCurrencyCode)
+      val subscriber = SignalStore.donationsValues().getSubscriber(currency)
+
+      if (subscriber != null) {
+        SignalStore.donationsValues().setSubscriber(subscriber)
+      } else {
+        SignalStore.donationsValues().setSubscriber(
+          Subscriber(
+            subscriberId = SubscriberId.generate(),
+            currencyCode = currency.currencyCode
+          )
+        )
+      }
+
+      StorageSyncHelper.scheduleSyncForDataChange()
     }
   }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/manage/ManageDonationsFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/manage/ManageDonationsFragment.kt
index 644bf1223c..35bcd29674 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/manage/ManageDonationsFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/manage/ManageDonationsFragment.kt
@@ -7,6 +7,7 @@ import androidx.navigation.NavOptions
 import androidx.navigation.fragment.findNavController
 import org.signal.core.util.DimensionUnit
 import org.thoughtcrime.securesms.R
+import org.thoughtcrime.securesms.badges.models.BadgePreview
 import org.thoughtcrime.securesms.components.settings.DSLConfiguration
 import org.thoughtcrime.securesms.components.settings.DSLSettingsAdapter
 import org.thoughtcrime.securesms.components.settings.DSLSettingsFragment
@@ -59,6 +60,7 @@ class ManageDonationsFragment : DSLSettingsFragment() {
 
     ActiveSubscriptionPreference.register(adapter)
     IndeterminateLoadingCircle.register(adapter)
+    BadgePreview.register(adapter)
 
     viewModel.state.observe(viewLifecycleOwner) { state ->
       adapter.submitList(getConfiguration(state).toMappingModelList())
@@ -75,6 +77,14 @@ class ManageDonationsFragment : DSLSettingsFragment() {
 
   private fun getConfiguration(state: ManageDonationsState): DSLConfiguration {
     return configure {
+      customPref(
+        BadgePreview.Model(
+          badge = state.featuredBadge
+        )
+      )
+
+      space(DimensionUnit.DP.toPixels(8f).toInt())
+
       sectionHeaderPref(
         title = DSLSettingsText.from(
           R.string.SubscribeFragment__signal_is_powered_by_people_like_you,
@@ -82,10 +92,12 @@ class ManageDonationsFragment : DSLSettingsFragment() {
         )
       )
 
+      space(DimensionUnit.DP.toPixels(32f).toInt())
+
       noPadTextPref(
         title = DSLSettingsText.from(
           R.string.ManageDonationsFragment__my_support,
-          DSLSettingsText.Title2BoldModifier
+          DSLSettingsText.Body1BoldModifier, DSLSettingsText.BoldModifier
         )
       )
 
@@ -94,7 +106,7 @@ class ManageDonationsFragment : DSLSettingsFragment() {
         if (activeSubscription.isActive) {
           val subscription: Subscription? = state.availableSubscriptions.firstOrNull { activeSubscription.activeSubscription.level == it.level }
           if (subscription != null) {
-            space(DimensionUnit.DP.toPixels(16f).toInt())
+            space(DimensionUnit.DP.toPixels(12f).toInt())
 
             customPref(
               ActiveSubscriptionPreference.Model(
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/subscribe/SubscribeFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/subscribe/SubscribeFragment.kt
index 117b46fe25..26cdb1649d 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/subscribe/SubscribeFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/subscribe/SubscribeFragment.kt
@@ -124,6 +124,8 @@ class SubscribeFragment : DSLSettingsFragment(
         )
       )
 
+      space(DimensionUnit.DP.toPixels(4f).toInt())
+
       state.subscriptions.forEach {
         val isActive = state.activeSubscription?.activeSubscription?.level == it.level
         customPref(
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/preferences/AvatarPreference.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/preferences/AvatarPreference.kt
index ea137b6387..aad9a87d04 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/preferences/AvatarPreference.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/preferences/AvatarPreference.kt
@@ -49,13 +49,19 @@ object AvatarPreference {
     }
 
     override fun bind(model: Model) {
-      badge.setBadgeFromRecipient(model.recipient)
-      badge.setOnClickListener {
-        val badge = model.recipient.badges.firstOrNull()
-        if (badge != null) {
-          model.onBadgeClick(badge)
+      if (model.recipient.isSelf) {
+        badge.setBadge(null)
+        badge.setOnClickListener(null)
+      } else {
+        badge.setBadgeFromRecipient(model.recipient)
+        badge.setOnClickListener {
+          val badge = model.recipient.badges.firstOrNull()
+          if (badge != null) {
+            model.onBadgeClick(badge)
+          }
         }
       }
+
       avatar.setAvatar(model.recipient)
       avatar.disableQuickContact()
       avatar.setOnClickListener { model.onAvatarClick(avatar) }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/contacts/ContactSelectionListItem.java b/app/src/main/java/org/thoughtcrime/securesms/contacts/ContactSelectionListItem.java
index ff5414b4b9..f20389f98f 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/contacts/ContactSelectionListItem.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/contacts/ContactSelectionListItem.java
@@ -121,7 +121,11 @@ public class ContactSelectionListItem extends ConstraintLayout implements Recipi
 
     this.checkBox.setVisibility(checkboxVisible ? View.VISIBLE : View.GONE);
 
-    badge.setBadgeFromRecipient(recipientSnapshot);
+    if (recipientSnapshot == null || recipientSnapshot.isSelf()) {
+      badge.setBadge(null);
+    } else {
+      badge.setBadgeFromRecipient(recipientSnapshot);
+    }
   }
 
   public void setChecked(boolean selected, boolean animate) {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationBannerView.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationBannerView.java
index bc14512281..9f01e19baa 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationBannerView.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationBannerView.java
@@ -57,7 +57,11 @@ public class ConversationBannerView extends ConstraintLayout {
   }
 
   public void setBadge(@Nullable Recipient recipient) {
-    contactBadge.setBadgeFromRecipient(recipient);
+    if (recipient == null || recipient.isSelf()) {
+      contactBadge.setBadge(null);
+    } else {
+      contactBadge.setBadgeFromRecipient(recipient);
+    }
   }
 
   public void setAvatar(@NonNull GlideRequests requests, @Nullable Recipient recipient) {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationTitleView.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationTitleView.java
index 2d0b85c415..a4370930b6 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationTitleView.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationTitleView.java
@@ -106,7 +106,11 @@ public class ConversationTitleView extends RelativeLayout {
       this.avatar.setAvatar(glideRequests, recipient, false);
     }
 
-    badge.setBadgeFromRecipient(recipient);
+    if (recipient == null || recipient.isSelf()) {
+      badge.setBadgeFromRecipient(null);
+    } else {
+      badge.setBadgeFromRecipient(recipient);
+    }
 
     updateVerifiedSubtitleVisibility();
   }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListFragment.java b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListFragment.java
index 1f740e992b..2948bd80aa 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListFragment.java
@@ -77,6 +77,8 @@ import org.thoughtcrime.securesms.MainNavigator;
 import org.thoughtcrime.securesms.MuteDialog;
 import org.thoughtcrime.securesms.NewConversationActivity;
 import org.thoughtcrime.securesms.R;
+import org.thoughtcrime.securesms.badges.models.Badge;
+import org.thoughtcrime.securesms.badges.self.expired.ExpiredBadgeBottomSheetDialogFragment;
 import org.thoughtcrime.securesms.components.RatingManager;
 import org.thoughtcrime.securesms.components.SearchToolbar;
 import org.thoughtcrime.securesms.components.menu.ActionItem;
@@ -322,6 +324,12 @@ public class ConversationListFragment extends MainFragment implements ActionMode
       Log.i(TAG, "Recaptcha required.");
       RecaptchaProofBottomSheetFragment.show(getChildFragmentManager());
     }
+
+    Badge expiredBadge = SignalStore.donationsValues().getExpiredBadge();
+    if (expiredBadge != null) {
+      SignalStore.donationsValues().setExpiredBadge(null);
+      ExpiredBadgeBottomSheetDialogFragment.show(expiredBadge, getParentFragmentManager());
+    }
   }
 
   @Override
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/RecipientDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/RecipientDatabase.java
index 67e7a7319d..61cbf922a3 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/RecipientDatabase.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/RecipientDatabase.java
@@ -23,6 +23,7 @@ import org.signal.zkgroup.InvalidInputException;
 import org.signal.zkgroup.groups.GroupMasterKey;
 import org.signal.zkgroup.profiles.ProfileKey;
 import org.signal.zkgroup.profiles.ProfileKeyCredential;
+import org.thoughtcrime.securesms.badges.Badges;
 import org.thoughtcrime.securesms.badges.models.Badge;
 import org.thoughtcrime.securesms.color.MaterialColor;
 import org.thoughtcrime.securesms.conversation.colors.AvatarColor;
@@ -1370,16 +1371,7 @@ public class RecipientDatabase extends Database {
       List<BadgeList.Badge> protoBadges = badgeList.getBadgesList();
       badges = new ArrayList<>(protoBadges.size());
       for (BadgeList.Badge protoBadge : protoBadges) {
-        badges.add(new Badge(
-            protoBadge.getId(),
-            Badge.Category.Companion.fromCode(protoBadge.getCategory()),
-            protoBadge.getName(),
-            protoBadge.getDescription(),
-            Uri.parse(protoBadge.getImageUrl()),
-            protoBadge.getImageDensity(),
-            protoBadge.getExpiration(),
-            protoBadge.getVisible()
-        ));
+        badges.add(Badges.fromDatabaseBadge(protoBadge));
       }
     } else {
       badges = Collections.emptyList();
@@ -1712,15 +1704,7 @@ public class RecipientDatabase extends Database {
     BadgeList.Builder badgeListBuilder = BadgeList.newBuilder();
 
     for (final Badge badge : badges) {
-      badgeListBuilder.addBadges(BadgeList.Badge.newBuilder()
-                                                .setId(badge.getId())
-                                                .setCategory(badge.getCategory().getCode())
-                                                .setDescription(badge.getDescription())
-                                                .setExpiration(badge.getExpirationTimestamp())
-                                                .setVisible(badge.getVisible())
-                                                .setName(badge.getName())
-                                                .setImageUrl(badge.getImageUrl().toString())
-                                                .setImageDensity(badge.getImageDensity()));
+      badgeListBuilder.addBadges(Badges.toDatabaseBadge(badge));
     }
 
     ContentValues values = new ContentValues(1);
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/BoostReceiptRequestResponseJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/BoostReceiptRequestResponseJob.java
index 990a8cd985..d728bc4201 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/BoostReceiptRequestResponseJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/BoostReceiptRequestResponseJob.java
@@ -59,16 +59,18 @@ public class BoostReceiptRequestResponseJob extends BaseJob {
     );
   }
 
-  public static Pair<String, String> enqueueChain(StripeApi.PaymentIntent paymentIntent) {
-    BoostReceiptRequestResponseJob requestReceiptJob = createJob(paymentIntent);
-    DonationReceiptRedemptionJob   redeemReceiptJob  = DonationReceiptRedemptionJob.createJobForBoost();
+  public static String enqueueChain(StripeApi.PaymentIntent paymentIntent) {
+    BoostReceiptRequestResponseJob requestReceiptJob    = createJob(paymentIntent);
+    DonationReceiptRedemptionJob   redeemReceiptJob     = DonationReceiptRedemptionJob.createJobForBoost();
+    RefreshOwnProfileJob           refreshOwnProfileJob = new RefreshOwnProfileJob();
 
     ApplicationDependencies.getJobManager()
                            .startChain(requestReceiptJob)
                            .then(redeemReceiptJob)
+                           .then(refreshOwnProfileJob)
                            .enqueue();
 
-    return new Pair<>(requestReceiptJob.getId(), redeemReceiptJob.getId());
+    return refreshOwnProfileJob.getId();
   }
 
   private BoostReceiptRequestResponseJob(@NonNull Parameters parameters,
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/RefreshOwnProfileJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/RefreshOwnProfileJob.java
index 4a3cf8de66..9e9b5f13be 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/RefreshOwnProfileJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/RefreshOwnProfileJob.java
@@ -1,6 +1,5 @@
 package org.thoughtcrime.securesms.jobs;
 
-import android.net.Uri;
 import android.text.TextUtils;
 
 import androidx.annotation.NonNull;
@@ -9,7 +8,6 @@ import androidx.annotation.Nullable;
 import org.signal.core.util.logging.Log;
 import org.signal.zkgroup.profiles.ProfileKey;
 import org.signal.zkgroup.profiles.ProfileKeyCredential;
-import org.thoughtcrime.securesms.BuildConfig;
 import org.thoughtcrime.securesms.badges.Badges;
 import org.thoughtcrime.securesms.badges.models.Badge;
 import org.thoughtcrime.securesms.crypto.ProfileKeyUtil;
@@ -23,10 +21,8 @@ import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.profiles.ProfileName;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.util.ProfileUtil;
-import org.thoughtcrime.securesms.util.ScreenDensity;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 import org.thoughtcrime.securesms.util.Util;
-import org.whispersystems.libsignal.util.Pair;
 import org.whispersystems.libsignal.util.guava.Optional;
 import org.whispersystems.signalservice.api.crypto.InvalidCiphertextException;
 import org.whispersystems.signalservice.api.profiles.ProfileAndCredential;
@@ -34,9 +30,10 @@ import org.whispersystems.signalservice.api.profiles.SignalServiceProfile;
 import org.whispersystems.signalservice.api.push.exceptions.PushNetworkException;
 
 import java.io.IOException;
-import java.math.BigDecimal;
-import java.sql.Timestamp;
+import java.util.Comparator;
 import java.util.List;
+import java.util.Objects;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 
@@ -175,11 +172,60 @@ public class RefreshOwnProfileJob extends BaseJob {
       return;
     }
 
+    Set<String> localDonorBadgeIds  = Recipient.self()
+                                               .getBadges()
+                                               .stream()
+                                               .filter(badge -> badge.getCategory() == Badge.Category.Donor)
+                                               .map(Badge::getId)
+                                               .collect(Collectors.toSet());
+
+    Set<String> remoteDonorBadgeIds = badges.stream()
+                                            .filter(badge -> Objects.equals(badge.getCategory(), Badge.Category.Donor.getCode()))
+                                            .map(SignalServiceProfile.Badge::getId)
+                                            .collect(Collectors.toSet());
+
+    boolean remoteHasSubscriptionBadges = remoteDonorBadgeIds.stream().anyMatch(RefreshOwnProfileJob::isSubscription);
+    boolean localHasSubscriptionBadges  = localDonorBadgeIds.stream().anyMatch(RefreshOwnProfileJob::isSubscription);
+    boolean remoteHasBoostBadges        = remoteDonorBadgeIds.stream().anyMatch(RefreshOwnProfileJob::isBoost);
+    boolean localHasBoostBadges         = localDonorBadgeIds.stream().anyMatch(RefreshOwnProfileJob::isBoost);
+
+    if (!remoteHasSubscriptionBadges && localHasSubscriptionBadges) {
+      Badge mostRecentExpiration = Recipient.self()
+                                            .getBadges()
+                                            .stream()
+                                            .filter(badge -> badge.getCategory() == Badge.Category.Donor)
+                                            .filter(badge -> isSubscription(badge.getId()))
+                                            .max(Comparator.comparingLong(Badge::getExpirationTimestamp))
+                                            .get();
+
+      Log.d(TAG, "Marking subscription badge as expired, should notifiy next time the conversation list is open.");
+      SignalStore.donationsValues().setExpiredBadge(mostRecentExpiration);
+    } else if (!remoteHasBoostBadges && localHasBoostBadges) {
+      Badge mostRecentExpiration = Recipient.self()
+                                            .getBadges()
+                                            .stream()
+                                            .filter(badge -> badge.getCategory() == Badge.Category.Donor)
+                                            .filter(badge -> isBoost(badge.getId()))
+                                            .max(Comparator.comparingLong(Badge::getExpirationTimestamp))
+                                            .get();
+
+      Log.d(TAG, "Marking boost badge as expired, should notifiy next time the conversation list is open.");
+      SignalStore.donationsValues().setExpiredBadge(mostRecentExpiration);
+    }
+
     DatabaseFactory.getRecipientDatabase(context)
                    .setBadges(Recipient.self().getId(),
                               badges.stream().map(Badges::fromServiceBadge).collect(Collectors.toList()));
   }
 
+  private static boolean isSubscription(String badgeId) {
+    return !Objects.equals(badgeId, Badge.BOOST_BADGE_ID);
+  }
+
+  private static boolean isBoost(String badgeId) {
+    return Objects.equals(badgeId, Badge.BOOST_BADGE_ID);
+  }
+
   public static final class Factory implements Job.Factory<RefreshOwnProfileJob> {
 
     @Override
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/SubscriptionReceiptRequestResponseJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/SubscriptionReceiptRequestResponseJob.java
index 3028b7f084..ad36250a42 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/SubscriptionReceiptRequestResponseJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/SubscriptionReceiptRequestResponseJob.java
@@ -64,17 +64,19 @@ public class SubscriptionReceiptRequestResponseJob extends BaseJob {
     );
   }
 
-  public static Pair<String, String> enqueueSubscriptionContinuation() {
-    Subscriber                            subscriber        = SignalStore.donationsValues().requireSubscriber();
-    SubscriptionReceiptRequestResponseJob requestReceiptJob = createJob(subscriber.getSubscriberId());
-    DonationReceiptRedemptionJob          redeemReceiptJob  = DonationReceiptRedemptionJob.createJobForSubscription();
+  public static String enqueueSubscriptionContinuation() {
+    Subscriber                            subscriber           = SignalStore.donationsValues().requireSubscriber();
+    SubscriptionReceiptRequestResponseJob requestReceiptJob    = createJob(subscriber.getSubscriberId());
+    DonationReceiptRedemptionJob          redeemReceiptJob     = DonationReceiptRedemptionJob.createJobForSubscription();
+    RefreshOwnProfileJob                  refreshOwnProfileJob = new RefreshOwnProfileJob();
 
     ApplicationDependencies.getJobManager()
                            .startChain(requestReceiptJob)
                            .then(redeemReceiptJob)
+                           .then(refreshOwnProfileJob)
                            .enqueue();
 
-    return new Pair<>(requestReceiptJob.getId(), redeemReceiptJob.getId());
+    return refreshOwnProfileJob.getId();
   }
 
   private SubscriptionReceiptRequestResponseJob(@NonNull Parameters parameters,
diff --git a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/DonationsValues.kt b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/DonationsValues.kt
index 5a3dca7c70..57487c6e5c 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/DonationsValues.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/DonationsValues.kt
@@ -4,6 +4,9 @@ import io.reactivex.rxjava3.core.Observable
 import io.reactivex.rxjava3.subjects.BehaviorSubject
 import io.reactivex.rxjava3.subjects.Subject
 import org.signal.donations.StripeApi
+import org.thoughtcrime.securesms.badges.Badges
+import org.thoughtcrime.securesms.badges.models.Badge
+import org.thoughtcrime.securesms.database.model.databaseprotos.BadgeList
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
 import org.thoughtcrime.securesms.payments.currency.CurrencyUtil
 import org.thoughtcrime.securesms.subscription.LevelUpdateOperation
@@ -25,11 +28,15 @@ internal class DonationsValues internal constructor(store: KeyValueStore) : Sign
     private const val KEY_LEVEL = "donation.level"
     private const val KEY_LAST_KEEP_ALIVE_LAUNCH = "donation.last.successful.ping"
     private const val KEY_LAST_END_OF_PERIOD = "donation.last.end.of.period"
+    private const val EXPIRED_BADGE = "donation.expired.badge"
   }
 
   override fun onFirstEverAppLaunch() = Unit
 
-  override fun getKeysToIncludeInBackup(): MutableList<String> = mutableListOf(KEY_SUBSCRIPTION_CURRENCY_CODE, KEY_LAST_KEEP_ALIVE_LAUNCH)
+  override fun getKeysToIncludeInBackup(): MutableList<String> = mutableListOf(
+    KEY_CURRENCY_CODE_BOOST,
+    KEY_LAST_KEEP_ALIVE_LAUNCH
+  )
 
   private val subscriptionCurrencyPublisher: Subject<Currency> by lazy { BehaviorSubject.createDefault(getSubscriptionCurrency()) }
   val observableSubscriptionCurrency: Observable<Currency> by lazy { subscriptionCurrencyPublisher }
@@ -76,18 +83,13 @@ internal class DonationsValues internal constructor(store: KeyValueStore) : Sign
     }
   }
 
-  fun setSubscriptionCurrency(currency: Currency) {
-    putString(KEY_SUBSCRIPTION_CURRENCY_CODE, currency.currencyCode)
-    subscriptionCurrencyPublisher.onNext(currency)
-  }
-
   fun setBoostCurrency(currency: Currency) {
     putString(KEY_CURRENCY_CODE_BOOST, currency.currencyCode)
     boostCurrencyPublisher.onNext(currency)
   }
 
-  fun getSubscriber(): Subscriber? {
-    val currencyCode = getSubscriptionCurrency().currencyCode
+  fun getSubscriber(currency: Currency): Subscriber? {
+    val currencyCode = currency.currencyCode
     val subscriberIdBytes = getBlob("$KEY_SUBSCRIBER_ID_PREFIX$currencyCode", null)
 
     return if (subscriberIdBytes == null) {
@@ -97,13 +99,22 @@ internal class DonationsValues internal constructor(store: KeyValueStore) : Sign
     }
   }
 
+  fun getSubscriber(): Subscriber? {
+    return getSubscriber(getSubscriptionCurrency())
+  }
+
   fun requireSubscriber(): Subscriber {
     return getSubscriber() ?: throw Exception("Subscriber ID is not set.")
   }
 
   fun setSubscriber(subscriber: Subscriber) {
     val currencyCode = subscriber.currencyCode
-    putBlob("$KEY_SUBSCRIBER_ID_PREFIX$currencyCode", subscriber.subscriberId.bytes)
+    store.beginWrite()
+      .putBlob("$KEY_SUBSCRIBER_ID_PREFIX$currencyCode", subscriber.subscriberId.bytes)
+      .putString(KEY_SUBSCRIPTION_CURRENCY_CODE, currencyCode)
+      .apply()
+
+    subscriptionCurrencyPublisher.onNext(Currency.getInstance(currencyCode))
   }
 
   fun getLevelOperation(): LevelUpdateOperation? {
@@ -133,6 +144,20 @@ internal class DonationsValues internal constructor(store: KeyValueStore) : Sign
     }
   }
 
+  fun setExpiredBadge(badge: Badge?) {
+    if (badge != null) {
+      putBlob(EXPIRED_BADGE, Badges.toDatabaseBadge(badge).toByteArray())
+    } else {
+      remove(EXPIRED_BADGE)
+    }
+  }
+
+  fun getExpiredBadge(): Badge? {
+    val badgeBytes = getBlob(EXPIRED_BADGE, null) ?: return null
+
+    return Badges.fromDatabaseBadge(BadgeList.Badge.parseFrom(badgeBytes))
+  }
+
   private fun clearLevelOperation() {
     remove(KEY_IDEMPOTENCY)
     remove(KEY_LEVEL)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/megaphone/Megaphones.java b/app/src/main/java/org/thoughtcrime/securesms/megaphone/Megaphones.java
index f2c87cae2b..b7ab172912 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/megaphone/Megaphones.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/megaphone/Megaphones.java
@@ -108,6 +108,7 @@ public final class Megaphones {
       put(Event.NOTIFICATIONS, shouldShowNotificationsMegaphone(context) ? RecurringSchedule.every(TimeUnit.DAYS.toMillis(30)) : NEVER);
       put(Event.CHAT_COLORS, ALWAYS);
       put(Event.ADD_A_PROFILE_PHOTO, shouldShowAddAProfilePhotoMegaphone(context) ? ALWAYS : NEVER);
+      put(Event.BECOME_A_SUSTAINER, shouldShowBecomeASustainerMegaphone() ? ALWAYS : NEVER);
     }};
   }
 
@@ -139,6 +140,8 @@ public final class Megaphones {
         return buildChatColorsMegaphone(context);
       case ADD_A_PROFILE_PHOTO:
         return buildAddAProfilePhotoMegaphone(context);
+      case BECOME_A_SUSTAINER:
+        return buildBecomeASustainerMegaphone(context);
       default:
         throw new IllegalArgumentException("Event not handled!");
     }
@@ -340,6 +343,22 @@ public final class Megaphones {
                         .build();
   }
 
+  private static @NonNull Megaphone buildBecomeASustainerMegaphone(@NonNull Context context) {
+    return new Megaphone.Builder(Event.BECOME_A_SUSTAINER, Megaphone.Style.BASIC)
+        .setTitle(R.string.BecomeASustainerMegaphone__become_a_sustainer)
+        .setImage(R.drawable.ic_become_a_sustainer_megaphone)
+        .setBody(R.string.BecomeASustainerMegaphone__signal_is_powered)
+        .setActionButton(R.string.BecomeASustainerMegaphone__donate, (megaphone, listener) -> {
+          listener.onMegaphoneNavigationRequested(AppSettingsActivity.subscriptions(context));
+          listener.onMegaphoneCompleted(Event.BECOME_A_SUSTAINER);
+        })
+        .setSecondaryButton(R.string.BecomeASustainerMegaphone__no_thanks, (megaphone, listener) -> {
+          listener.onMegaphoneCompleted(Event.BECOME_A_SUSTAINER);
+        })
+        .build();
+  }
+
+
   private static boolean shouldShowMessageRequestsMegaphone() {
     return Recipient.self().getProfileName() == ProfileName.EMPTY;
   }
@@ -364,6 +383,10 @@ public final class Megaphones {
     return SignalStore.onboarding().hasOnboarding(context);
   }
 
+  private static boolean shouldShowBecomeASustainerMegaphone() {
+    return FeatureFlags.donorBadges();
+  }
+
   private static boolean shouldShowNotificationsMegaphone(@NonNull Context context) {
     boolean shouldShow = !SignalStore.settings().isMessageNotificationsEnabled() ||
                          !NotificationChannels.isMessageChannelEnabled(context) ||
@@ -410,7 +433,8 @@ public final class Megaphones {
     ONBOARDING("onboarding"),
     NOTIFICATIONS("notifications"),
     CHAT_COLORS("chat_colors"),
-    ADD_A_PROFILE_PHOTO("add_a_profile_photo");
+    ADD_A_PROFILE_PHOTO("add_a_profile_photo"),
+    BECOME_A_SUSTAINER("become_a_sustainer");
 
     private final String key;
 
diff --git a/app/src/main/res/drawable/ic_become_a_sustainer_megaphone.xml b/app/src/main/res/drawable/ic_become_a_sustainer_megaphone.xml
new file mode 100644
index 0000000000..8aa01e46b0
--- /dev/null
+++ b/app/src/main/res/drawable/ic_become_a_sustainer_megaphone.xml
@@ -0,0 +1,24 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="64dp"
+    android:height="64dp"
+    android:viewportWidth="64"
+    android:viewportHeight="64">
+  <path
+      android:pathData="M32,0L32,0c17.673,0 32,14.327 32,32l0,0c0,17.673 -14.327,32 -32,32l0,0C14.327,64 0,49.673 0,32l0,0C0,14.327 14.327,0 32,0z"
+      android:fillColor="#E0E9FF"/>
+  <path
+      android:pathData="M43.67,12.1c-1.535,-0.002 -3.055,0.301 -4.472,0.891s-2.703,1.454 -3.784,2.544c-1.253,1.207 -2.396,2.523 -3.414,3.933c-1.019,-1.41 -2.161,-2.726 -3.414,-3.933c-1.632,-1.633 -3.711,-2.746 -5.975,-3.197C20.347,11.887 18,12.117 15.867,13c-2.133,0.883 -3.956,2.378 -5.239,4.298c-1.283,1.919 -1.968,4.176 -1.968,6.484C8.66,39.7 32,56.2 32,56.2s23.34,-16.5 23.34,-32.418c0.002,-1.534 -0.299,-3.053 -0.884,-4.47c-0.586,-1.417 -1.445,-2.705 -2.529,-3.791s-2.371,-1.946 -3.788,-2.533C46.722,12.402 45.204,12.1 43.67,12.1L43.67,12.1z"
+      android:fillColor="#F5D7D7"/>
+  <path
+      android:pathData="M45.959,31.6l-0.042,0.042c-2.421,2.658 -7.017,8.937 -9.951,10.701c-0.026,0.015 -0.053,0.027 -0.081,0.036c-0.81,0.222 -2.493,0.504 -3.618,1.119c-0.137,0.074 -0.245,0.191 -0.309,0.333c-0.063,0.142 -0.077,0.301 -0.04,0.452c0.037,0.151 0.123,0.285 0.245,0.382c0.122,0.097 0.272,0.15 0.428,0.152c0.389,-0.015 0.78,-0.001 1.167,0.042c0.018,0.003 0.036,0.003 0.054,0c1.563,-0.096 4.059,1.8 2.181,3.069c-1.473,1.2 -4.914,0.492 -6.066,1.71c-0.039,0.04 -0.067,0.09 -0.081,0.144c-0.014,0.055 -0.012,0.112 0.004,0.166c0.016,0.054 0.046,0.102 0.087,0.141c0.041,0.038 0.091,0.065 0.146,0.077c2.94,0.675 6.537,0 7.236,1.8C43.07,47.023 51.782,38.344 54.5,29.215C52.01,28.693 48.344,29.764 45.959,31.6z"
+      android:fillColor="#E2B7B7"/>
+  <path
+      android:pathData="M30.2,54.856c2.004,-0.741 3.774,-1.548 3.942,-2.361c0.009,-0.048 0.006,-0.097 -0.009,-0.144c-0.015,-0.047 -0.04,-0.089 -0.075,-0.123c-1.719,-1.74 -5.631,0.219 -7.665,-1.641c-0.049,-0.046 -0.082,-0.106 -0.096,-0.171c-0.552,-2.964 6.216,-1.83 7.554,-3.9c0.002,-0.014 0.002,-0.028 0,-0.042c-0.978,-1.326 -3,-0.21 -4.176,-1.233c-0.651,-0.63 -0.324,-1.449 0.255,-1.989c0.042,-0.041 0.071,-0.093 0.085,-0.151c0.014,-0.057 0.012,-0.117 -0.006,-0.173c-0.018,-0.056 -0.051,-0.106 -0.096,-0.144c-0.045,-0.038 -0.099,-0.063 -0.157,-0.072c-8.88,-1.5 -7.686,-9.396 -11.322,-11.808c-0.035,-0.024 -0.075,-0.04 -0.117,-0.047c-0.042,-0.007 -0.085,-0.005 -0.126,0.005c-2.877,0.6 -4.041,-1.119 -5.496,-3.507c-0.009,-0.016 -0.02,-0.031 -0.033,-0.045c-1.066,-1.139 -2.441,-1.942 -3.957,-2.31C9.629,37.81 24.911,50.74 30.2,54.856z"
+      android:fillColor="#E2B7B7"/>
+  <path
+      android:pathData="M34.124,39.331c1.306,-0.479 2.425,-1.359 3.198,-2.515c0.773,-1.156 1.158,-2.528 1.101,-3.917c-0.057,-1.389 -0.554,-2.725 -1.419,-3.813c-0.865,-1.089 -2.053,-1.875 -3.394,-2.245c-1.34,-0.37 -2.764,-0.305 -4.065,0.186c-1.301,0.491 -2.412,1.383 -3.174,2.546c-0.762,1.163 -1.134,2.539 -1.063,3.927c0.07,1.389 0.58,2.719 1.455,3.8c0.867,1.057 2.04,1.819 3.357,2.183C31.44,39.847 32.838,39.794 34.124,39.331z"
+      android:fillColor="#FCF6C4"/>
+  <path
+      android:pathData="M33.371,40.78c3.615,-0.684 6.234,-3.969 6.261,-7.614c0.001,-1.6 -0.493,-3.161 -1.414,-4.47c-0.921,-1.309 -2.223,-2.301 -3.729,-2.841c-1.506,-0.54 -3.143,-0.602 -4.685,-0.176c-1.543,0.426 -2.916,1.317 -3.932,2.553c-1.016,1.236 -1.626,2.756 -1.746,4.351c-0.119,1.596 0.257,3.189 1.078,4.563c0.821,1.374 2.046,2.46 3.508,3.11C30.174,40.907 31.801,41.09 33.371,40.78L33.371,40.78zM26.234,29.8c0.717,-1.198 1.798,-2.137 3.085,-2.679c1.287,-0.542 2.713,-0.66 4.072,-0.336c1.358,0.324 2.578,1.073 3.482,2.138c0.903,1.065 1.444,2.39 1.542,3.783c0.099,1.393 -0.25,2.781 -0.994,3.963c-0.744,1.181 -1.846,2.095 -3.146,2.607c-1.299,0.512 -2.728,0.597 -4.078,0.241c-1.351,-0.355 -2.553,-1.132 -3.431,-2.218c-0.839,-1.049 -1.339,-2.328 -1.434,-3.667C25.236,32.293 25.551,30.956 26.234,29.8L26.234,29.8zM27.527,21.016c0.021,0.076 0.027,0.155 0.017,0.234c-0.01,0.078 -0.035,0.154 -0.074,0.222c-0.039,0.069 -0.091,0.129 -0.153,0.177c-0.062,0.048 -0.134,0.084 -0.21,0.105c-0.077,0.021 -0.158,0.027 -0.237,0.017c-0.079,-0.01 -0.156,-0.036 -0.225,-0.077c-0.131,-0.082 -0.229,-0.209 -0.276,-0.357l-0.621,-1.572c-0.021,-0.076 -0.027,-0.155 -0.017,-0.234c0.01,-0.078 0.035,-0.154 0.074,-0.222c0.039,-0.069 0.091,-0.129 0.153,-0.177c0.062,-0.048 0.133,-0.084 0.209,-0.105c0.077,-0.021 0.158,-0.027 0.237,-0.017c0.079,0.01 0.156,0.036 0.225,0.077c0.129,0.083 0.224,0.208 0.27,0.354l0.621,1.572L27.527,21.016zM28.874,24.424c0.021,0.077 0.026,0.158 0.015,0.237c-0.011,0.079 -0.037,0.156 -0.078,0.225c-0.081,0.137 -0.212,0.236 -0.366,0.276c-0.153,0.04 -0.316,0.017 -0.453,-0.062c-0.131,-0.082 -0.229,-0.209 -0.276,-0.357l-0.621,-1.572c-0.023,-0.077 -0.03,-0.158 -0.019,-0.237c0.01,-0.08 0.037,-0.156 0.079,-0.225c0.04,-0.068 0.092,-0.128 0.155,-0.176c0.063,-0.048 0.134,-0.083 0.211,-0.103s0.156,-0.025 0.234,-0.014c0.078,0.011 0.153,0.037 0.222,0.077c0.132,0.083 0.228,0.211 0.273,0.36L28.874,24.424L28.874,24.424zM36.533,43.186c0.021,0.076 0.027,0.155 0.017,0.234c-0.01,0.078 -0.035,0.154 -0.074,0.222c-0.039,0.069 -0.091,0.129 -0.153,0.177c-0.062,0.048 -0.134,0.084 -0.21,0.105c-0.077,0.021 -0.158,0.027 -0.237,0.017c-0.079,-0.01 -0.156,-0.036 -0.225,-0.077c-0.131,-0.082 -0.229,-0.209 -0.276,-0.357c-0.2,-0.498 -0.394,-0.998 -0.582,-1.5c-0.022,-0.077 -0.028,-0.158 -0.018,-0.237c0.01,-0.079 0.037,-0.156 0.078,-0.225c0.079,-0.135 0.207,-0.234 0.357,-0.276c0.157,-0.04 0.324,-0.017 0.465,0.063c0.131,0.083 0.227,0.209 0.273,0.357c0.195,0.498 0.387,0.999 0.6,1.5L36.533,43.186zM37.838,46.408c0.023,0.078 0.029,0.159 0.018,0.239c-0.011,0.08 -0.038,0.157 -0.081,0.226c-0.079,0.134 -0.207,0.232 -0.357,0.273c-0.077,0.021 -0.158,0.027 -0.237,0.017c-0.079,-0.01 -0.156,-0.036 -0.225,-0.077c-0.069,-0.034 -0.127,-0.087 -0.168,-0.153c-0.053,-0.057 -0.09,-0.128 -0.108,-0.204l-0.558,-1.362c-0.022,-0.077 -0.029,-0.158 -0.018,-0.237c0.01,-0.079 0.037,-0.156 0.078,-0.225c0.081,-0.134 0.209,-0.233 0.36,-0.276c0.077,-0.021 0.158,-0.027 0.237,-0.017s0.156,0.036 0.225,0.077c0.132,0.084 0.229,0.211 0.276,0.36C37.462,45.503 37.648,45.956 37.838,46.408L37.838,46.408zM37.325,21.448c-0.028,0.101 -0.082,0.193 -0.156,0.267l-0.12,0.093c-0.103,0.061 -0.222,0.089 -0.341,0.081c-0.119,-0.007 -0.234,-0.05 -0.328,-0.123c-0.095,-0.073 -0.166,-0.172 -0.204,-0.286c-0.038,-0.113 -0.041,-0.236 -0.009,-0.351c0.219,-0.54 0.441,-1.077 0.66,-1.617c0.028,-0.1 0.082,-0.191 0.156,-0.264l0.12,-0.093c0.068,-0.04 0.143,-0.066 0.222,-0.077c0.078,-0.011 0.158,-0.006 0.234,0.014c0.076,0.02 0.148,0.055 0.211,0.103c0.063,0.048 0.116,0.108 0.155,0.176c0.04,0.069 0.066,0.146 0.077,0.225c0.01,0.079 0.005,0.16 -0.017,0.237C37.763,20.371 37.544,20.911 37.325,21.448L37.325,21.448zM35.954,24.808c-0.026,0.1 -0.079,0.191 -0.153,0.264l-0.123,0.093c-0.137,0.08 -0.3,0.102 -0.453,0.062c-0.154,-0.04 -0.285,-0.139 -0.366,-0.276c-0.041,-0.069 -0.068,-0.146 -0.079,-0.226c-0.011,-0.08 -0.005,-0.161 0.016,-0.239l0.558,-1.368c0.029,-0.1 0.083,-0.19 0.156,-0.264l0.12,-0.093c0.103,-0.056 0.219,-0.081 0.336,-0.072c0.117,0.009 0.228,0.052 0.32,0.124c0.093,0.072 0.162,0.169 0.2,0.28c0.038,0.111 0.043,0.23 0.014,0.343l-0.558,1.368L35.954,24.808zM28.154,43.33c-0.038,0.066 -0.089,0.124 -0.15,0.171c-0.061,0.046 -0.13,0.08 -0.204,0.099c-0.156,0.041 -0.322,0.02 -0.462,-0.06c-0.135,-0.079 -0.235,-0.208 -0.276,-0.36c-0.037,-0.156 -0.016,-0.321 0.06,-0.462c0.186,-0.44 0.376,-0.879 0.57,-1.317c0.038,-0.068 0.089,-0.127 0.15,-0.175c0.061,-0.047 0.132,-0.082 0.207,-0.101c0.077,-0.021 0.158,-0.027 0.237,-0.017s0.156,0.036 0.225,0.077c0.134,0.081 0.233,0.209 0.276,0.36c0.021,0.078 0.021,0.159 0,0.237c-0.004,0.08 -0.029,0.157 -0.072,0.225c-0.2,0.438 -0.39,0.877 -0.57,1.317L28.154,43.33zM26.87,46.456c-0.026,0.1 -0.079,0.191 -0.153,0.264l-0.12,0.093c-0.103,0.061 -0.222,0.089 -0.341,0.082c-0.119,-0.007 -0.234,-0.05 -0.328,-0.123c-0.095,-0.073 -0.166,-0.172 -0.203,-0.286c-0.038,-0.113 -0.041,-0.236 -0.009,-0.351c0.2,-0.49 0.4,-0.978 0.6,-1.464c0.028,-0.1 0.082,-0.191 0.156,-0.264l0.12,-0.096c0.068,-0.04 0.144,-0.066 0.222,-0.077c0.078,-0.011 0.158,-0.006 0.234,0.014c0.076,0.02 0.148,0.055 0.211,0.103c0.063,0.048 0.116,0.108 0.155,0.176c0.04,0.069 0.066,0.146 0.077,0.225c0.01,0.079 0.005,0.16 -0.017,0.237l-0.6,1.467H26.87zM43.334,38.623c-0.1,-0.028 -0.191,-0.082 -0.264,-0.156l-0.093,-0.12c-0.04,-0.068 -0.066,-0.143 -0.077,-0.222c-0.011,-0.078 -0.006,-0.158 0.014,-0.234c0.02,-0.076 0.055,-0.148 0.103,-0.211c0.048,-0.063 0.108,-0.116 0.176,-0.155c0.069,-0.04 0.146,-0.066 0.225,-0.077c0.079,-0.01 0.16,-0.005 0.237,0.017l1.245,0.513c0.1,0.026 0.192,0.078 0.264,0.153l0.096,0.12c0.04,0.068 0.066,0.144 0.077,0.222c0.011,0.078 0.006,0.158 -0.014,0.234c-0.02,0.076 -0.055,0.148 -0.103,0.211c-0.048,0.063 -0.107,0.116 -0.176,0.155c-0.069,0.04 -0.146,0.066 -0.225,0.077c-0.079,0.01 -0.16,0.005 -0.237,-0.017l-1.245,-0.51H43.334zM40.226,37.339c-0.101,-0.025 -0.192,-0.078 -0.264,-0.153l-0.096,-0.12c-0.041,-0.07 -0.067,-0.147 -0.077,-0.226c-0.01,-0.08 -0.004,-0.161 0.017,-0.239c0.044,-0.149 0.143,-0.277 0.276,-0.357c0.069,-0.04 0.146,-0.066 0.225,-0.077c0.079,-0.01 0.16,-0.005 0.237,0.017l1.245,0.516c0.1,0.026 0.191,0.079 0.264,0.153l0.093,0.123c0.04,0.069 0.066,0.146 0.077,0.225c0.01,0.079 0.005,0.16 -0.017,0.237c-0.043,0.153 -0.144,0.283 -0.283,0.361c-0.138,0.078 -0.302,0.098 -0.455,0.056l-1.242,-0.513V37.339zM21.434,29.449c-0.1,-0.028 -0.191,-0.082 -0.264,-0.156l-0.093,-0.12c-0.04,-0.069 -0.066,-0.146 -0.077,-0.225s-0.005,-0.16 0.017,-0.237c0.041,-0.151 0.139,-0.28 0.273,-0.36c0.069,-0.041 0.146,-0.067 0.226,-0.077c0.08,-0.01 0.161,-0.004 0.239,0.017l1.698,0.705c0.101,0.029 0.193,0.082 0.267,0.156l0.093,0.12c0.04,0.069 0.066,0.146 0.077,0.225c0.01,0.079 0.005,0.16 -0.017,0.237c-0.039,0.153 -0.137,0.285 -0.273,0.366c-0.069,0.04 -0.146,0.066 -0.225,0.077s-0.16,0.005 -0.237,-0.017l-1.701,-0.705L21.434,29.449zM17.771,27.928c-0.146,-0.05 -0.272,-0.147 -0.357,-0.276c-0.08,-0.137 -0.102,-0.301 -0.061,-0.454c0.04,-0.154 0.14,-0.285 0.277,-0.365c0.069,-0.041 0.145,-0.067 0.225,-0.078c0.079,-0.011 0.16,-0.006 0.237,0.015l1.83,0.762c0.147,0.05 0.274,0.147 0.36,0.276c0.08,0.137 0.102,0.301 0.061,0.454c-0.041,0.154 -0.14,0.285 -0.277,0.365c-0.069,0.04 -0.146,0.066 -0.225,0.077c-0.079,0.01 -0.16,0.005 -0.237,-0.017L17.771,27.928L17.771,27.928zM20,37.3c0.078,-0.021 0.159,-0.027 0.239,-0.016c0.08,0.011 0.157,0.038 0.226,0.079c0.135,0.079 0.234,0.207 0.276,0.357c0.02,0.081 0.023,0.166 0.01,0.248c-0.013,0.083 -0.043,0.161 -0.088,0.232c-0.034,0.069 -0.087,0.127 -0.153,0.168c-0.057,0.054 -0.128,0.091 -0.204,0.108l-1.38,0.567c-0.077,0.021 -0.158,0.027 -0.237,0.017c-0.079,-0.01 -0.156,-0.036 -0.225,-0.077c-0.068,-0.04 -0.127,-0.093 -0.175,-0.156c-0.048,-0.063 -0.082,-0.135 -0.102,-0.211c-0.02,-0.076 -0.024,-0.156 -0.013,-0.234c0.011,-0.078 0.037,-0.153 0.077,-0.221c0.083,-0.131 0.21,-0.228 0.357,-0.276L20,37.3zM23.231,35.995c0.077,-0.023 0.159,-0.029 0.239,-0.019c0.08,0.01 0.157,0.037 0.226,0.079c0.135,0.08 0.232,0.209 0.273,0.36c0.021,0.077 0.027,0.158 0.017,0.237s-0.036,0.156 -0.077,0.225c-0.083,0.132 -0.209,0.229 -0.357,0.276c-0.456,0.18 -0.912,0.363 -1.368,0.549c-0.077,0.021 -0.158,0.027 -0.237,0.017c-0.079,-0.01 -0.156,-0.036 -0.225,-0.077c-0.136,-0.079 -0.236,-0.209 -0.278,-0.361c-0.042,-0.152 -0.021,-0.315 0.056,-0.452c0.082,-0.132 0.209,-0.23 0.357,-0.276l1.368,-0.549L23.231,35.995zM41.744,28.456c0.09,-0.055 0.194,-0.084 0.3,-0.084l0.159,0.021c0.114,0.031 0.217,0.095 0.295,0.184c0.078,0.089 0.128,0.199 0.143,0.317c0.015,0.117 -0.004,0.237 -0.057,0.343c-0.052,0.106 -0.135,0.195 -0.237,0.254l-1.683,0.714c-0.091,0.053 -0.195,0.081 -0.3,0.081l-0.159,-0.021c-0.15,-0.042 -0.278,-0.141 -0.357,-0.276c-0.041,-0.069 -0.067,-0.145 -0.078,-0.225c-0.011,-0.079 -0.006,-0.16 0.015,-0.237c0.044,-0.15 0.142,-0.279 0.276,-0.36L41.744,28.456L41.744,28.456zM45.881,26.689c0.143,-0.072 0.306,-0.093 0.462,-0.06c0.15,0.042 0.278,0.141 0.357,0.276c0.04,0.068 0.066,0.143 0.077,0.222c0.011,0.078 0.006,0.158 -0.014,0.234c-0.02,0.076 -0.055,0.148 -0.103,0.211c-0.048,0.063 -0.108,0.116 -0.176,0.155l-2.067,0.882c-0.142,0.073 -0.306,0.095 -0.462,0.06c-0.15,-0.041 -0.278,-0.139 -0.357,-0.273c-0.04,-0.068 -0.066,-0.143 -0.077,-0.221c-0.011,-0.078 -0.007,-0.158 0.013,-0.234c0.02,-0.076 0.054,-0.148 0.102,-0.211c0.048,-0.063 0.107,-0.116 0.175,-0.156l2.07,-0.9V26.689z"
+      android:fillColor="#6D2313"/>
+</vector>
diff --git a/app/src/main/res/drawable/selectable_rounded_outline.xml b/app/src/main/res/drawable/selectable_rounded_outline.xml
index 4eff28f1fd..8d9c699935 100644
--- a/app/src/main/res/drawable/selectable_rounded_outline.xml
+++ b/app/src/main/res/drawable/selectable_rounded_outline.xml
@@ -2,7 +2,7 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_selected="true">
         <shape android:shape="rectangle" xmlns:android="http://schemas.android.com/apk/res/android">
-            <stroke android:color="@color/signal_accent_primary" android:width="1dp" />
+            <stroke android:color="@color/signal_accent_primary" android:width="2dp" />
             <corners android:radius="10dp" />
         </shape>
     </item>
diff --git a/app/src/main/res/layout/featured_badge_preview_preference.xml b/app/src/main/res/layout/featured_badge_preview_preference.xml
index e805a4dff3..2ffca91656 100644
--- a/app/src/main/res/layout/featured_badge_preview_preference.xml
+++ b/app/src/main/res/layout/featured_badge_preview_preference.xml
@@ -3,15 +3,12 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginBottom="16dp"
     app:cardCornerRadius="0dp"
     app:cardElevation="0dp">
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_marginTop="24dp"
-        android:layout_marginBottom="24dp">
+        android:layout_height="match_parent">
 
         <org.thoughtcrime.securesms.components.AvatarImageView
             android:id="@+id/avatar"
diff --git a/app/src/main/res/layout/select_featured_badge_fragment.xml b/app/src/main/res/layout/select_featured_badge_fragment.xml
index c3993c8793..555474ab0c 100644
--- a/app/src/main/res/layout/select_featured_badge_fragment.xml
+++ b/app/src/main/res/layout/select_featured_badge_fragment.xml
@@ -6,26 +6,6 @@
 
     <include layout="@layout/dsl_settings_toolbar" />
 
-    <FrameLayout
-        android:id="@+id/section_header_container"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:minHeight="48dp"
-        android:paddingStart="@dimen/dsl_settings_gutter"
-        android:paddingTop="16dp"
-        android:paddingEnd="@dimen/dsl_settings_gutter"
-        android:paddingBottom="12dp"
-        app:layout_constraintTop_toBottomOf="@id/toolbar">
-
-        <TextView
-            android:id="@+id/section_header"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/SelectFeaturedBadgeFragment__preview"
-            android:textAppearance="@style/TextAppearance.Signal.Body1.Bold"
-            android:textStyle="bold" />
-    </FrameLayout>
-
     <include
         android:id="@+id/preview"
         layout="@layout/featured_badge_preview_preference"
@@ -33,7 +13,7 @@
         android:layout_height="wrap_content"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/section_header_container" />
+        app:layout_constraintTop_toBottomOf="@id/toolbar" />
 
     <View
         android:id="@+id/scroll_shadow"
diff --git a/app/src/main/res/layout/subscription_currency_selection.xml b/app/src/main/res/layout/subscription_currency_selection.xml
index 425f785a15..23bbf0d1fa 100644
--- a/app/src/main/res/layout/subscription_currency_selection.xml
+++ b/app/src/main/res/layout/subscription_currency_selection.xml
@@ -27,6 +27,7 @@
         android:layout_height="wrap_content"
         android:background="@drawable/circled_rectangle_outline"
         android:drawablePadding="8dp"
+        android:minHeight="32dp"
         android:padding="12dp"
         app:drawableEndCompat="@drawable/ic_chevron_down_20"
         app:drawableTint="@color/conversation_mention_background_color"
diff --git a/app/src/main/res/layout/subscription_flow_badge_preview_preference.xml b/app/src/main/res/layout/subscription_flow_badge_preview_preference.xml
index efcdbb4d15..6bc14c6e1a 100644
--- a/app/src/main/res/layout/subscription_flow_badge_preview_preference.xml
+++ b/app/src/main/res/layout/subscription_flow_badge_preview_preference.xml
@@ -9,8 +9,7 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginTop="24dp"
-        android:layout_marginBottom="24dp">
+        android:layout_marginBottom="8dp">
 
         <org.thoughtcrime.securesms.components.AvatarImageView
             android:id="@+id/avatar"
diff --git a/app/src/main/res/layout/subscription_preference.xml b/app/src/main/res/layout/subscription_preference.xml
index 9998298894..cdb5869561 100644
--- a/app/src/main/res/layout/subscription_preference.xml
+++ b/app/src/main/res/layout/subscription_preference.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_marginStart="@dimen/dsl_settings_gutter"
-    android:layout_marginTop="16dp"
+    android:layout_marginTop="12dp"
     android:layout_marginEnd="@dimen/dsl_settings_gutter"
     android:background="@drawable/selectable_rounded_outline"
     android:padding="16dp">
diff --git a/app/src/main/res/layout/view_badge_bottom_sheet_dialog_fragment.xml b/app/src/main/res/layout/view_badge_bottom_sheet_dialog_fragment.xml
index e041e01c0f..ae7c411f22 100644
--- a/app/src/main/res/layout/view_badge_bottom_sheet_dialog_fragment.xml
+++ b/app/src/main/res/layout/view_badge_bottom_sheet_dialog_fragment.xml
@@ -21,6 +21,22 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="12dp" />
 
+    <TextView
+        android:id="@+id/no_support"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/dsl_settings_gutter"
+        android:layout_marginTop="12dp"
+        android:layout_marginEnd="@dimen/dsl_settings_gutter"
+        android:text="@string/ViewBadgeBottomSheetDialogFragment__your_device_doesn_t_support_google_pay_so_you_can_t_subscribe_to_earn_a_badge_you_can_still_support_signal_by_making_a_donation_on_our_website"
+        android:textAlignment="center"
+        android:textAppearance="@style/TextAppearance.Signal.Body2"
+        android:textColor="@color/signal_text_secondary"
+        android:visibility="gone"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/tab_layout" />
+
     <com.google.android.material.tabs.TabLayout
         android:id="@+id/tab_layout"
         android:layout_width="match_parent"
@@ -41,8 +57,8 @@
         android:layout_marginBottom="32dp"
         android:minHeight="48dp"
         android:text="@string/ViewBadgeBottomSheetDialogFragment__become_a_sustainer"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/description" />
+        app:iconGravity="textEnd"
+        app:iconTint="@color/white"
+        tools:icon="@drawable/ic_open_20" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 1a7f86f0ac..108d9e74a2 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -3722,6 +3722,12 @@
     <string name="AddAProfilePhotoMegaphone__not_now">Not now</string>
     <string name="AddAProfilePhotoMegaphone__add_photo">Add photo</string>
 
+    <!-- BecomeASustainerMegaphone -->
+    <string name="BecomeASustainerMegaphone__become_a_sustainer">Become a Sustainer</string>
+    <string name="BecomeASustainerMegaphone__signal_is_powered">Signal is powered by people like you. Donate and receive a profile badge.</string>
+    <string name="BecomeASustainerMegaphone__no_thanks">No thanks</string>
+    <string name="BecomeASustainerMegaphone__donate">Donate</string>
+
     <!-- KeyboardPagerFragment -->
     <string name="KeyboardPagerFragment_emoji">Emoji</string>
     <string name="KeyboardPagerFragment_open_emoji_search">Open emoji search</string>
@@ -3972,6 +3978,10 @@
     <string name="ExpiredBadgeBottomSheetDialogFragment__to_continue_supporting">To continue supporting technology that is built for you—not for your data—please consider becoming a monthly subscriber.</string>
     <string name="ExpiredBadgeBottomSheetDialogFragment__become_a_subscriber">Become a subscriber</string>
     <string name="ExpiredBadgeBottomSheetDialogFragment__not_now">Not now</string>
+    <string name="ExpiredBadgeBottomSheetDialogFragment__your_subscription_was_cancelled">Your subscription was cancelled.</string>
+    <string name="ExpiredBadgeBottomSheetDialogFragment__because">Because you were inactive for more than 45 days, your subscription to Signal has been automatically cancelled.</string>
+    <string name="ExpiredBadgeBottomSheetDialogFragment__to_continue_supporting_signal">To continue supporting Signal and to reactivate your badge, renew now.</string>
+    <string name="ExpiredBadgeBottomSheetDialogFragment__renew_subscription">Renew subscription</string>
 
     <string name="Subscription__verification_failed">Subscription Verification Failed</string>
     <string name="Subscription__please_contact_support_for_more_information">Please contact support for more information.</string>
@@ -3987,6 +3997,7 @@
     <string name="DonationsErrors__you_have_to_set_up_google_pay_to_donate_in_app">You have to set up Google Pay to donate in-app.</string>
     <string name="DonationsErrors__failed_to_cancel_subscription">Failed to cancel subscription</string>
     <string name="DonationsErrors__subscription_cancellation_requires_an_internet_connection">Subscription cancellation requires an internet connection.</string>
+    <string name="ViewBadgeBottomSheetDialogFragment__your_device_doesn_t_support_google_pay_so_you_can_t_subscribe_to_earn_a_badge_you_can_still_support_signal_by_making_a_donation_on_our_website">Your device doesn\'t support Google Pay, so you can\'t subscribe to earn a badge. You can still support Signal by making a donation on our website.</string>
 
     <!-- EOF -->