diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/DSLSettingsAdapter.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/DSLSettingsAdapter.kt
index 1a832f5f13..19999e882c 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/DSLSettingsAdapter.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/DSLSettingsAdapter.kt
@@ -157,7 +157,7 @@ class ExternalLinkPreferenceViewHolder(itemView: View) : PreferenceViewHolder<Ex
     val externalLinkIcon = requireNotNull(ContextCompat.getDrawable(context, R.drawable.ic_open_20))
     externalLinkIcon.setBounds(0, 0, ViewUtil.dpToPx(20), ViewUtil.dpToPx(20))
 
-    if (itemView.layoutDirection == View.LAYOUT_DIRECTION_LTR) {
+    if (ViewUtil.isLtr(itemView)) {
       titleView.setCompoundDrawables(null, null, externalLinkIcon, null)
     } else {
       titleView.setCompoundDrawables(externalLinkIcon, null, null, null)
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 840b2ce32c..9d766e110a 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
@@ -14,7 +14,6 @@ import org.thoughtcrime.securesms.components.settings.PreferenceModel
 import org.thoughtcrime.securesms.components.settings.PreferenceViewHolder
 import org.thoughtcrime.securesms.components.settings.configure
 import org.thoughtcrime.securesms.keyvalue.SignalStore
-import org.thoughtcrime.securesms.mms.GlideApp
 import org.thoughtcrime.securesms.phonenumbers.PhoneNumberFormatter
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.util.FeatureFlags
@@ -181,6 +180,10 @@ class AppSettingsFragment : DSLSettingsFragment(R.string.text_secure_normal__men
     override fun areContentsTheSame(newItem: PaymentsPreference): Boolean {
       return super.areContentsTheSame(newItem) && unreadCount == newItem.unreadCount
     }
+
+    override fun areItemsTheSame(newItem: PaymentsPreference): Boolean {
+      return true
+    }
   }
 
   private class PaymentsPreferenceViewHolder(itemView: View) : MappingViewHolder<PaymentsPreference>(itemView) {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/notifications/NotificationsSettingsFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/notifications/NotificationsSettingsFragment.kt
index 3e194371c0..00929eaa34 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/notifications/NotificationsSettingsFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/notifications/NotificationsSettingsFragment.kt
@@ -312,7 +312,7 @@ class NotificationsSettingsFragment : DSLSettingsFragment(R.string.preferences__
       circleDrawable.setBounds(0, 0, ViewUtil.dpToPx(20), ViewUtil.dpToPx(20))
       circleDrawable.colorFilter = model.colorValues[model.radioListPreference.selected].toColorFilter()
 
-      if (titleView.layoutDirection == View.LAYOUT_DIRECTION_LTR) {
+      if (ViewUtil.isLtr(itemView)) {
         titleView.setCompoundDrawables(null, null, circleDrawable, null)
       } else {
         titleView.setCompoundDrawables(circleDrawable, null, null, null)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/dsl.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/dsl.kt
index bb389a6a15..f72a4690eb 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/dsl.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/dsl.kt
@@ -112,7 +112,7 @@ abstract class PreferenceModel<T : PreferenceModel<T>>(
     return when {
       title != null -> title == newItem.title
       summary != null -> summary == newItem.summary
-      else -> throw AssertionError("Could not determine equality.")
+      else -> throw AssertionError("Could not determine equality of $newItem. Did you forget to override this method?")
     }
   }