diff --git a/app/src/main/java/org/thoughtcrime/securesms/preferences/ClearAllDataDialog.kt b/app/src/main/java/org/thoughtcrime/securesms/preferences/ClearAllDataDialog.kt
index 560c137104..fa3be71307 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/preferences/ClearAllDataDialog.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/preferences/ClearAllDataDialog.kt
@@ -42,6 +42,7 @@ class ClearAllDataDialog : BaseDialog() {
         var selectedOption = device
         val optionAdapter = RadioOptionAdapter { selectedOption = it }
         binding.recyclerView.apply {
+            itemAnimator = null
             adapter = optionAdapter
             addItemDecoration(DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL))
             setHasFixedSize(true)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/preferences/ListPreferenceDialog.kt b/app/src/main/java/org/thoughtcrime/securesms/preferences/ListPreferenceDialog.kt
index e407c67774..2ba48f6e41 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/preferences/ListPreferenceDialog.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/preferences/ListPreferenceDialog.kt
@@ -1,42 +1,41 @@
 package org.thoughtcrime.securesms.preferences
 
+import android.content.Context
 import android.view.LayoutInflater
 import androidx.appcompat.app.AlertDialog
 import androidx.preference.ListPreference
-import androidx.recyclerview.widget.DividerItemDecoration
 import network.loki.messenger.databinding.DialogListPreferenceBinding
-import org.thoughtcrime.securesms.conversation.v2.utilities.BaseDialog
 
-class ListPreferenceDialog(
-    private val listPreference: ListPreference,
-    private val dialogListener: () -> Unit
-) : BaseDialog() {
-    private lateinit var binding: DialogListPreferenceBinding
+fun listPreferenceDialog(
+    context: Context,
+    listPreference: ListPreference,
+    dialogListener: () -> Unit
+) : AlertDialog {
 
-    override fun setContentView(builder: AlertDialog.Builder) {
-        binding = DialogListPreferenceBinding.inflate(LayoutInflater.from(requireContext()))
-        binding.titleTextView.text = listPreference.dialogTitle
-        binding.messageTextView.text = listPreference.dialogMessage
-        binding.closeButton.setOnClickListener {
-            dismiss()
-        }
-        val options = listPreference.entryValues.zip(listPreference.entries) { value, title ->
-            RadioOption(value.toString(), title.toString())
-        }
-        val valueIndex = listPreference.findIndexOfValue(listPreference.value)
-        val optionAdapter = RadioOptionAdapter(valueIndex) {
-            listPreference.value = it.value
-            dismiss()
-            dialogListener.invoke()
-        }
-        binding.recyclerView.apply {
-            adapter = optionAdapter
-            addItemDecoration(DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL))
-            setHasFixedSize(true)
-        }
-        optionAdapter.submitList(options)
-        builder.setView(binding.root)
-        builder.setCancelable(false)
+    val builder = AlertDialog.Builder(context)
+
+    val binding = DialogListPreferenceBinding.inflate(LayoutInflater.from(context))
+    binding.titleTextView.text = listPreference.dialogTitle
+    binding.messageTextView.text = listPreference.dialogMessage
+
+    builder.setView(binding.root)
+
+    val dialog = builder.show()
+
+    val valueIndex = listPreference.findIndexOfValue(listPreference.value)
+    RadioOptionAdapter(valueIndex) {
+        listPreference.value = it.value
+        dialog.dismiss()
+        dialogListener()
     }
+        .apply {
+            listPreference.entryValues.zip(listPreference.entries) { value, title ->
+                RadioOption(value.toString(), title.toString())
+            }.let(this::submitList)
+        }
+        .let { binding.recyclerView.adapter = it }
 
-}
\ No newline at end of file
+    binding.closeButton.setOnClickListener { dialog.dismiss() }
+
+    return dialog
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/preferences/NotificationsPreferenceFragment.java b/app/src/main/java/org/thoughtcrime/securesms/preferences/NotificationsPreferenceFragment.java
index 9ae78fc5cf..4eaa58e815 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/preferences/NotificationsPreferenceFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/preferences/NotificationsPreferenceFragment.java
@@ -2,6 +2,8 @@ package org.thoughtcrime.securesms.preferences;
 
 import static android.app.Activity.RESULT_OK;
 
+import static org.thoughtcrime.securesms.preferences.ListPreferenceDialogKt.listPreferenceDialog;
+
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.Intent;
@@ -77,10 +79,10 @@ public class NotificationsPreferenceFragment extends ListSummaryPreferenceFragme
         .setOnPreferenceClickListener(preference -> {
           ListPreference listPreference = (ListPreference) preference;
           listPreference.setDialogMessage(R.string.preferences_notifications__content_message);
-          new ListPreferenceDialog(listPreference, () -> {
-              initializeListSummary((ListPreference) findPreference(TextSecurePreferences.NOTIFICATION_PRIVACY_PREF));
+          listPreferenceDialog(getContext(), listPreference, () -> {
+              initializeListSummary(findPreference(TextSecurePreferences.NOTIFICATION_PRIVACY_PREF));
               return null;
-          }).show(getChildFragmentManager(), "ListPreferenceDialog");
+          });
           return true;
         });
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/preferences/RadioOptionAdapter.kt b/app/src/main/java/org/thoughtcrime/securesms/preferences/RadioOptionAdapter.kt
index 2cb61a0e82..4bb69c4c14 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/preferences/RadioOptionAdapter.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/preferences/RadioOptionAdapter.kt
@@ -16,8 +16,8 @@ class RadioOptionAdapter(
 ) : ListAdapter<RadioOption, RadioOptionAdapter.ViewHolder>(RadioOptionDiffer()) {
 
     class RadioOptionDiffer: DiffUtil.ItemCallback<RadioOption>() {
-        override fun areItemsTheSame(oldItem: RadioOption, newItem: RadioOption) = oldItem === newItem
-        override fun areContentsTheSame(oldItem: RadioOption, newItem: RadioOption) = oldItem == newItem
+        override fun areItemsTheSame(oldItem: RadioOption, newItem: RadioOption) = oldItem.title == newItem.title
+        override fun areContentsTheSame(oldItem: RadioOption, newItem: RadioOption) = oldItem.value == newItem.value
     }
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
@@ -31,7 +31,7 @@ class RadioOptionAdapter(
         holder.bind(option, isSelected) {
             onClickListener(it)
             selectedOptionPosition = position
-            notifyDataSetChanged()
+            notifyItemRangeChanged(0, itemCount)
         }
     }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/preferences/SettingsActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/preferences/SettingsActivity.kt
index 1e44574925..9bfc5d57b2 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/preferences/SettingsActivity.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/preferences/SettingsActivity.kt
@@ -32,11 +32,8 @@ import nl.komponents.kovenant.ui.alwaysUi
 import nl.komponents.kovenant.ui.successUi
 import org.session.libsession.avatars.AvatarHelper
 import org.session.libsession.messaging.MessagingModuleConfiguration
-import org.session.libsession.utilities.Address
-import org.session.libsession.utilities.ProfileKeyUtil
-import org.session.libsession.utilities.ProfilePictureUtilities
+import org.session.libsession.utilities.*
 import org.session.libsession.utilities.SSKEnvironment.ProfileManagerProtocol
-import org.session.libsession.utilities.TextSecurePreferences
 import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity
 import org.thoughtcrime.securesms.avatar.AvatarSelection
 import org.thoughtcrime.securesms.components.ProfilePictureView
@@ -85,7 +82,7 @@ class SettingsActivity : PassphraseRequiredActionBarActivity() {
         super.onCreate(savedInstanceState, isReady)
         binding = ActivitySettingsBinding.inflate(layoutInflater)
         setContentView(binding.root)
-        val displayName = TextSecurePreferences.getProfileName(this) ?: hexEncodedPublicKey
+        val displayName = getDisplayName()
         glide = GlideApp.with(this)
         with(binding) {
             setupProfilePictureView(profilePictureView.root)
@@ -112,10 +109,13 @@ class SettingsActivity : PassphraseRequiredActionBarActivity() {
         }
     }
 
+    private fun getDisplayName(): String =
+        TextSecurePreferences.getProfileName(this) ?: truncateIdForDisplay(hexEncodedPublicKey)
+
     private fun setupProfilePictureView(view: ProfilePictureView) {
         view.glide = glide
         view.publicKey = hexEncodedPublicKey
-        view.displayName = TextSecurePreferences.getProfileName(this) ?: hexEncodedPublicKey
+        view.displayName = getDisplayName()
         view.isLarge = true
         view.update()
     }
diff --git a/app/src/main/res/layout/activity_join_public_chat.xml b/app/src/main/res/layout/activity_join_public_chat.xml
index d437a230fc..e4d5fb433b 100644
--- a/app/src/main/res/layout/activity_join_public_chat.xml
+++ b/app/src/main/res/layout/activity_join_public_chat.xml
@@ -11,7 +11,6 @@
         android:layout_height="match_parent" >
 
         <com.google.android.material.tabs.TabLayout
-            style="@style/Widget.Session.TabLayout"
             android:id="@+id/tabLayout"
             android:layout_width="match_parent"
             android:layout_height="@dimen/tab_bar_height" />
diff --git a/app/src/main/res/layout/activity_link_device.xml b/app/src/main/res/layout/activity_link_device.xml
index 4c5df3b6f2..b267c08ac8 100644
--- a/app/src/main/res/layout/activity_link_device.xml
+++ b/app/src/main/res/layout/activity_link_device.xml
@@ -12,7 +12,6 @@
         android:layout_height="match_parent" >
 
         <com.google.android.material.tabs.TabLayout
-            style="@style/Widget.Session.TabLayout"
             android:id="@+id/tabLayout"
             android:layout_width="match_parent"
             android:layout_height="@dimen/tab_bar_height" />
diff --git a/app/src/main/res/layout/activity_qr_code.xml b/app/src/main/res/layout/activity_qr_code.xml
index 6a1229648e..58c7e40c82 100644
--- a/app/src/main/res/layout/activity_qr_code.xml
+++ b/app/src/main/res/layout/activity_qr_code.xml
@@ -6,7 +6,6 @@
     android:layout_height="match_parent" >
 
     <com.google.android.material.tabs.TabLayout
-        style="@style/Widget.Session.TabLayout"
         android:id="@+id/tabLayout"
         android:layout_width="match_parent"
         android:layout_height="@dimen/tab_bar_height" />
diff --git a/app/src/main/res/layout/dialog_blocked.xml b/app/src/main/res/layout/dialog_blocked.xml
index 479210f1df..4ad01ec8ee 100644
--- a/app/src/main/res/layout/dialog_blocked.xml
+++ b/app/src/main/res/layout/dialog_blocked.xml
@@ -35,7 +35,7 @@
         android:orientation="horizontal">
 
         <Button
-            style="@style/Widget.Session.Button.Dialog.Unimportant"
+            style="@style/Widget.Session.Button.Dialog.UnimportantText"
             android:id="@+id/cancelButton"
             android:layout_width="0dp"
             android:layout_height="@dimen/small_button_height"
@@ -43,7 +43,7 @@
             android:text="@string/cancel" />
 
         <Button
-            style="@style/Widget.Session.Button.Dialog.Unimportant"
+            style="@style/Widget.Session.Button.Dialog.UnimportantText"
             android:id="@+id/unblockButton"
             android:contentDescription="@string/AccessibilityId_block_confirm"
             android:layout_width="0dp"
diff --git a/app/src/main/res/layout/dialog_download.xml b/app/src/main/res/layout/dialog_download.xml
index 8c49cd3ab2..a54a0357c2 100644
--- a/app/src/main/res/layout/dialog_download.xml
+++ b/app/src/main/res/layout/dialog_download.xml
@@ -35,7 +35,7 @@
         android:orientation="horizontal">
 
         <Button
-            style="@style/Widget.Session.Button.Dialog.Unimportant"
+            style="@style/Widget.Session.Button.Dialog.UnimportantText"
             android:id="@+id/cancelButton"
             android:layout_width="0dp"
             android:layout_height="@dimen/small_button_height"
@@ -44,7 +44,7 @@
             android:text="@string/cancel" />
 
         <Button
-            style="@style/Widget.Session.Button.Dialog.Unimportant"
+            style="@style/Widget.Session.Button.Dialog.UnimportantText"
             android:id="@+id/downloadButton"
             android:layout_width="0dp"
             android:layout_height="@dimen/small_button_height"
diff --git a/app/src/main/res/layout/dialog_join_open_group.xml b/app/src/main/res/layout/dialog_join_open_group.xml
index 81289b6dd4..7c422a1e33 100644
--- a/app/src/main/res/layout/dialog_join_open_group.xml
+++ b/app/src/main/res/layout/dialog_join_open_group.xml
@@ -35,7 +35,7 @@
         android:orientation="horizontal">
 
         <Button
-            style="@style/Widget.Session.Button.Dialog.Unimportant"
+            style="@style/Widget.Session.Button.Dialog.UnimportantText"
             android:id="@+id/cancelButton"
             android:layout_width="0dp"
             android:layout_height="@dimen/small_button_height"
@@ -43,7 +43,7 @@
             android:text="@string/cancel" />
 
         <Button
-            style="@style/Widget.Session.Button.Dialog.Unimportant"
+            style="@style/Widget.Session.Button.Dialog.UnimportantText"
             android:id="@+id/joinButton"
             android:layout_width="0dp"
             android:layout_height="@dimen/small_button_height"
diff --git a/app/src/main/res/layout/dialog_link_preview.xml b/app/src/main/res/layout/dialog_link_preview.xml
index 6d4b29ea73..0344439f55 100644
--- a/app/src/main/res/layout/dialog_link_preview.xml
+++ b/app/src/main/res/layout/dialog_link_preview.xml
@@ -35,7 +35,7 @@
         android:orientation="horizontal">
 
         <Button
-            style="@style/Widget.Session.Button.Dialog.Unimportant"
+            style="@style/Widget.Session.Button.Dialog.UnimportantText"
             android:id="@+id/cancelButton"
             android:layout_width="0dp"
             android:layout_height="@dimen/small_button_height"
@@ -44,7 +44,7 @@
             android:contentDescription="@string/AccessibilityId_cancel_link_preview_button"/>
 
         <Button
-            style="@style/Widget.Session.Button.Dialog.Unimportant"
+            style="@style/Widget.Session.Button.Dialog.UnimportantText"
             android:id="@+id/enableLinkPreviewsButton"
             android:layout_width="0dp"
             android:layout_height="@dimen/small_button_height"
diff --git a/app/src/main/res/layout/dialog_list_preference.xml b/app/src/main/res/layout/dialog_list_preference.xml
index cf7be2d2c0..1dfe219e85 100644
--- a/app/src/main/res/layout/dialog_list_preference.xml
+++ b/app/src/main/res/layout/dialog_list_preference.xml
@@ -3,8 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="?dialog_background_color">
+    android:layout_height="match_parent">
 
     <TextView
         android:id="@+id/titleTextView"
@@ -21,11 +20,10 @@
 
     <ImageView
         android:id="@+id/closeButton"
+        android:background="?selectableItemBackgroundBorderless"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="@dimen/medium_spacing"
-        android:clickable="true"
-        android:focusable="true"
         android:src="@drawable/ic_baseline_close_24"
         app:layout_constraintBottom_toBottomOf="@id/titleTextView"
         app:layout_constraintEnd_toEndOf="parent"
@@ -36,7 +34,6 @@
         android:id="@+id/messageTextView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="?dialog_background_color"
         android:drawablePadding="@dimen/large_spacing"
         android:gravity="center_horizontal|center_vertical"
         android:paddingHorizontal="@dimen/large_spacing"
diff --git a/app/src/main/res/layout/dialog_open_url.xml b/app/src/main/res/layout/dialog_open_url.xml
index af5b09b9c7..ec0befef21 100644
--- a/app/src/main/res/layout/dialog_open_url.xml
+++ b/app/src/main/res/layout/dialog_open_url.xml
@@ -35,7 +35,7 @@
         android:orientation="horizontal">
 
         <Button
-            style="@style/Widget.Session.Button.Dialog.Unimportant"
+            style="@style/Widget.Session.Button.Dialog.UnimportantText"
             android:id="@+id/cancelButton"
             android:layout_width="0dp"
             android:layout_height="@dimen/small_button_height"
@@ -43,7 +43,7 @@
             android:text="@string/cancel" />
 
         <Button
-            style="@style/Widget.Session.Button.Dialog.Unimportant"
+            style="@style/Widget.Session.Button.Dialog.UnimportantText"
             android:id="@+id/openURLButton"
             android:layout_width="0dp"
             android:layout_height="@dimen/small_button_height"
diff --git a/app/src/main/res/layout/dialog_send_seed.xml b/app/src/main/res/layout/dialog_send_seed.xml
index 5bec0be4dd..1aed6f0428 100644
--- a/app/src/main/res/layout/dialog_send_seed.xml
+++ b/app/src/main/res/layout/dialog_send_seed.xml
@@ -35,7 +35,7 @@
         android:orientation="horizontal">
 
         <Button
-            style="@style/Widget.Session.Button.Dialog.Unimportant"
+            style="@style/Widget.Session.Button.Dialog.UnimportantText"
             android:id="@+id/cancelButton"
             android:layout_width="0dp"
             android:layout_height="@dimen/small_button_height"
@@ -43,7 +43,7 @@
             android:text="@string/cancel" />
 
         <Button
-            style="@style/Widget.Session.Button.Dialog.Destructive"
+            style="@style/Widget.Session.Button.Dialog.DestructiveText"
             android:id="@+id/sendSeedButton"
             android:layout_width="0dp"
             android:layout_height="@dimen/small_button_height"
diff --git a/app/src/main/res/layout/dialog_share_logs.xml b/app/src/main/res/layout/dialog_share_logs.xml
index 5d1a94f686..adb3a9e2d8 100644
--- a/app/src/main/res/layout/dialog_share_logs.xml
+++ b/app/src/main/res/layout/dialog_share_logs.xml
@@ -33,7 +33,7 @@
         android:orientation="horizontal">
 
         <Button
-            style="@style/Widget.Session.Button.Dialog.Unimportant"
+            style="@style/Widget.Session.Button.Dialog.UnimportantText"
             android:id="@+id/cancelButton"
             android:layout_width="0dp"
             android:layout_height="@dimen/small_button_height"
@@ -41,7 +41,7 @@
             android:text="@string/cancel" />
 
         <Button
-            style="@style/Widget.Session.Button.Dialog.Unimportant"
+            style="@style/Widget.Session.Button.Dialog.UnimportantText"
             android:id="@+id/shareButton"
             android:layout_width="0dp"
             android:layout_height="@dimen/small_button_height"
diff --git a/app/src/main/res/layout/fragment_join_community.xml b/app/src/main/res/layout/fragment_join_community.xml
index 79643510d7..b5d2e2db25 100644
--- a/app/src/main/res/layout/fragment_join_community.xml
+++ b/app/src/main/res/layout/fragment_join_community.xml
@@ -47,7 +47,6 @@
 
     <com.google.android.material.tabs.TabLayout
         android:id="@+id/tabLayout"
-        style="@style/Widget.Session.TabLayout"
         android:layout_width="match_parent"
         android:layout_height="@dimen/tab_bar_height"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/fragment_new_message.xml b/app/src/main/res/layout/fragment_new_message.xml
index 2e9e6168c4..226a869eb5 100644
--- a/app/src/main/res/layout/fragment_new_message.xml
+++ b/app/src/main/res/layout/fragment_new_message.xml
@@ -48,7 +48,6 @@
 
     <com.google.android.material.tabs.TabLayout
         android:id="@+id/tabLayout"
-        style="@style/Widget.Session.TabLayout"
         android:layout_width="match_parent"
         android:layout_height="@dimen/tab_bar_height"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/fragment_view_my_qr_code.xml b/app/src/main/res/layout/fragment_view_my_qr_code.xml
index e99d4f6583..8bcdb43853 100644
--- a/app/src/main/res/layout/fragment_view_my_qr_code.xml
+++ b/app/src/main/res/layout/fragment_view_my_qr_code.xml
@@ -62,7 +62,7 @@
                 android:text="@string/fragment_view_my_qr_code_explanation" />
 
             <Button
-                style="@style/Widget.Session.Button.Common.UnimportantOutline"
+                style="@style/Widget.Session.Button.Common.ProminentOutline"
                 android:id="@+id/shareButton"
                 android:layout_width="196dp"
                 android:layout_height="@dimen/medium_button_height"
diff --git a/app/src/main/res/layout/giphy_activity.xml b/app/src/main/res/layout/giphy_activity.xml
index 4a03c09686..d54df8e8eb 100644
--- a/app/src/main/res/layout/giphy_activity.xml
+++ b/app/src/main/res/layout/giphy_activity.xml
@@ -28,7 +28,6 @@
                     android:id="@+id/tab_layout"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:theme="@style/Widget.Session.TabLayout"
                     app:tabRippleColor="@color/cell_selected"
                     app:tabIndicatorColor="?colorAccent"
                     android:scrollbars="horizontal"/>
diff --git a/app/src/main/res/layout/media_overview_activity.xml b/app/src/main/res/layout/media_overview_activity.xml
index eaa36d2194..6956adc454 100644
--- a/app/src/main/res/layout/media_overview_activity.xml
+++ b/app/src/main/res/layout/media_overview_activity.xml
@@ -21,7 +21,6 @@
 
         <org.thoughtcrime.securesms.components.ControllableTabLayout
                 android:id="@+id/tab_layout"
-                style="@style/Widget.Session.TabLayout"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="top"/>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 1e97e737b7..8c79423d55 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -56,7 +56,6 @@
         <item name="elevation">1dp</item>
         <item name="tabIndicatorColor">@color/transparent</item>
         <item name="tabIndicatorHeight">@dimen/accent_line_thickness</item>
-        <item name="tabRippleColor">@color/cell_selected</item>
         <item name="tabTextAppearance">@style/TextAppearance.Session.Tab</item>
     </style>
 
@@ -123,19 +122,10 @@
         <item name="android:textColor">?android:textColorPrimary</item>
     </style>
 
-    <style name="Widget.Session.Button.Dialog.Unimportant">
-        <item name="android:background">@drawable/unimportant_dialog_button_background</item>
-    </style>
-
     <style name="Widget.Session.Button.Dialog.UnimportantText">
         <item name="android:background">@drawable/unimportant_dialog_text_button_background</item>
     </style>
-
-    <style name="Widget.Session.Button.Dialog.Destructive">
-        <item name="android:background">@drawable/destructive_dialog_button_background</item>
-        <item name="android:textColor">@color/black</item>
-    </style>
-
+    
     <style name="Widget.Session.Button.Dialog.DestructiveText">
         <item name="android:background">@drawable/destructive_dialog_text_button_background</item>
         <item name="android:textColor">@color/destructive</item>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 44cef145ce..c0c67987ca 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -303,6 +303,8 @@
         <item name="dividerHorizontal">?dividerVertical</item>
         <item name="message_received_background_color">#F2F2F2</item>
         <item name="colorAccent">@color/classic_accent</item>
+        <item name="colorControlHighlight">?android:colorControlHighlight</item>
+        <item name="tabStyle">@style/Widget.Session.TabLayout</item>
     </style>
 
     <style name="Ocean">
@@ -310,6 +312,8 @@
         <item name="dividerHorizontal">?dividerVertical</item>
         <item name="message_received_background_color">#F2F2F2</item>
         <item name="colorAccent">@color/ocean_accent</item>
+        <item name="colorControlHighlight">?android:colorControlHighlight</item>
+        <item name="tabStyle">@style/Widget.Session.TabLayout</item>
     </style>
 
     <style name="Classic.Dark">
diff --git a/libsession/src/main/java/org/session/libsession/messaging/utilities/UpdateMessageBuilder.kt b/libsession/src/main/java/org/session/libsession/messaging/utilities/UpdateMessageBuilder.kt
index 24741b8e65..e4db056d8e 100644
--- a/libsession/src/main/java/org/session/libsession/messaging/utilities/UpdateMessageBuilder.kt
+++ b/libsession/src/main/java/org/session/libsession/messaging/utilities/UpdateMessageBuilder.kt
@@ -7,16 +7,17 @@ import org.session.libsession.messaging.calls.CallMessageType
 import org.session.libsession.messaging.contacts.Contact
 import org.session.libsession.messaging.sending_receiving.data_extraction.DataExtractionNotificationInfoMessage
 import org.session.libsession.utilities.ExpirationUtil
+import org.session.libsession.utilities.truncateIdForDisplay
 
 object UpdateMessageBuilder {
 
-    fun buildGroupUpdateMessage(context: Context, updateMessageData: UpdateMessageData, sender: String? = null, isOutgoing: Boolean = false): String {
+    fun buildGroupUpdateMessage(context: Context, updateMessageData: UpdateMessageData, senderId: String? = null, isOutgoing: Boolean = false): String {
         var message = ""
         val updateData = updateMessageData.kind ?: return message
-        if (!isOutgoing && sender == null) return message
+        if (!isOutgoing && senderId == null) return message
         val storage = MessagingModuleConfiguration.shared.storage
         val senderName: String = if (!isOutgoing) {
-            storage.getContactWithSessionID(sender!!)?.displayName(Contact.ContactContext.REGULAR) ?: sender
+            storage.getContactWithSessionID(senderId!!)?.displayName(Contact.ContactContext.REGULAR) ?: truncateIdForDisplay(senderId)
         } else { context.getString(R.string.MessageRecord_you) }
 
         when (updateData) {
@@ -78,11 +79,11 @@ object UpdateMessageBuilder {
         return message
     }
 
-    fun buildExpirationTimerMessage(context: Context, duration: Long, sender: String? = null, isOutgoing: Boolean = false): String {
-        if (!isOutgoing && sender == null) return ""
+    fun buildExpirationTimerMessage(context: Context, duration: Long, senderId: String? = null, isOutgoing: Boolean = false): String {
+        if (!isOutgoing && senderId == null) return ""
         val storage = MessagingModuleConfiguration.shared.storage
         val senderName: String? = if (!isOutgoing) {
-            storage.getContactWithSessionID(sender!!)?.displayName(Contact.ContactContext.REGULAR) ?: sender
+            storage.getContactWithSessionID(senderId!!)?.displayName(Contact.ContactContext.REGULAR) ?: truncateIdForDisplay(senderId)
         } else { context.getString(R.string.MessageRecord_you) }
         return if (duration <= 0) {
             if (isOutgoing) context.getString(R.string.MessageRecord_you_disabled_disappearing_messages)
@@ -94,9 +95,9 @@ object UpdateMessageBuilder {
         }
     }
 
-    fun buildDataExtractionMessage(context: Context, kind: DataExtractionNotificationInfoMessage.Kind, sender: String? = null): String {
+    fun buildDataExtractionMessage(context: Context, kind: DataExtractionNotificationInfoMessage.Kind, senderId: String? = null): String {
         val storage = MessagingModuleConfiguration.shared.storage
-        val senderName = storage.getContactWithSessionID(sender!!)?.displayName(Contact.ContactContext.REGULAR) ?: sender!!
+        val senderName = storage.getContactWithSessionID(senderId!!)?.displayName(Contact.ContactContext.REGULAR) ?: truncateIdForDisplay(senderId)
         return when (kind) {
             DataExtractionNotificationInfoMessage.Kind.SCREENSHOT ->
                 context.getString(R.string.MessageRecord_s_took_a_screenshot, senderName)
diff --git a/libsession/src/main/java/org/session/libsession/utilities/IdUtil.kt b/libsession/src/main/java/org/session/libsession/utilities/IdUtil.kt
new file mode 100644
index 0000000000..ccaa31c2f9
--- /dev/null
+++ b/libsession/src/main/java/org/session/libsession/utilities/IdUtil.kt
@@ -0,0 +1,4 @@
+package org.session.libsession.utilities
+
+fun truncateIdForDisplay(id: String): String =
+    id.takeIf { it.length > 8 }?.apply{ "${take(4)}…${takeLast(4)}" } ?: id
diff --git a/libsession/src/main/java/org/session/libsession/utilities/ViewUtils.kt b/libsession/src/main/java/org/session/libsession/utilities/ViewUtils.kt
index f67abe8ec4..ea4932d05c 100644
--- a/libsession/src/main/java/org/session/libsession/utilities/ViewUtils.kt
+++ b/libsession/src/main/java/org/session/libsession/utilities/ViewUtils.kt
@@ -17,7 +17,4 @@ fun Context.getColorFromAttr(
 }
 
 val RecyclerView.isScrolledToBottom: Boolean
-    get() {
-        val contentHeight = height - (paddingTop + paddingBottom)
-        return computeVerticalScrollRange() == computeVerticalScrollOffset() + contentHeight
-    }
+    get() = computeVerticalScrollOffset() + computeVerticalScrollExtent() >= computeVerticalScrollRange()