diff --git a/app/src/main/java/org/thoughtcrime/securesms/preferences/BlockedContactsAdapter.kt b/app/src/main/java/org/thoughtcrime/securesms/preferences/BlockedContactsAdapter.kt
index 6c13133a4e..1bd3b28610 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/preferences/BlockedContactsAdapter.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/preferences/BlockedContactsAdapter.kt
@@ -32,6 +32,12 @@ class BlockedContactsAdapter(val viewModel: BlockedContactsViewModel) : ListAdap
         holder.bind(selectable, viewModel::toggle)
     }
 
+    override fun onBindViewHolder(holder: ViewHolder, position: Int, payloads: MutableList<Any>) {
+        val selectable = getItem(position)
+        if (payloads.isEmpty()) holder.bind(selectable, viewModel::toggle)
+        else holder.select(selectable.isSelected)
+    }
+
     override fun onViewRecycled(holder: ViewHolder) {
         super.onViewRecycled(holder)
         holder.binding.profilePictureView.root.recycle()
@@ -51,5 +57,9 @@ class BlockedContactsAdapter(val viewModel: BlockedContactsViewModel) : ListAdap
             binding.root.setOnClickListener { toggle(selectable) }
             binding.selectButton.isSelected = selectable.isSelected
         }
+
+        fun select(isSelected: Boolean) {
+            binding.selectButton.isSelected = isSelected
+        }
     }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/preferences/BlockedContactsViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/preferences/BlockedContactsViewModel.kt
index 0b13201220..0c93b2cc09 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/preferences/BlockedContactsViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/preferences/BlockedContactsViewModel.kt
@@ -104,7 +104,7 @@ class BlockedContactsViewModel @Inject constructor(private val storage: Storage)
 
     fun toggle(selectable: SelectableItem<Recipient>) {
         _state.value = state.run {
-            if (selectable.isSelected) copy(selectedItems = selectedItems - selectable.item)
+            if (selectable.item in selectedItems) copy(selectedItems = selectedItems - selectable.item)
             else copy(selectedItems = selectedItems + selectable.item)
         }
     }
diff --git a/app/src/main/res/drawable/destructive_outline_button_medium_background.xml b/app/src/main/res/drawable/destructive_outline_button_medium_background.xml
index ac41ee6217..c6e01ef98e 100644
--- a/app/src/main/res/drawable/destructive_outline_button_medium_background.xml
+++ b/app/src/main/res/drawable/destructive_outline_button_medium_background.xml
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<shape
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid  android:color="@color/transparent" />
-
-    <corners android:radius="@dimen/medium_button_corner_radius" />
-
-    <stroke android:width="@dimen/border_thickness" android:color="@color/button_destructive" />
-</shape>
\ No newline at end of file
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="@color/button_destructive">
+    <item>
+        <shape android:shape="rectangle">
+            <solid android:color="?colorPrimary"/>
+            <corners android:radius="@dimen/medium_button_corner_radius" />
+            <stroke
+                android:color="@color/button_destructive"
+                android:width="@dimen/border_thickness" />
+        </shape>
+    </item>
+</ripple>
diff --git a/app/src/main/res/drawable/prominent_outline_button_medium_background.xml b/app/src/main/res/drawable/prominent_outline_button_medium_background.xml
index ee3bec8f7f..4bde2f855c 100644
--- a/app/src/main/res/drawable/prominent_outline_button_medium_background.xml
+++ b/app/src/main/res/drawable/prominent_outline_button_medium_background.xml
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<shape
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid  android:color="@color/transparent" />
-
-    <corners android:radius="@dimen/medium_button_corner_radius" />
-
-    <stroke android:width="@dimen/border_thickness" android:color="?prominentButtonColor" />
-</shape>
\ No newline at end of file
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="?prominentButtonColor">
+    <item>
+        <shape android:shape="rectangle">
+            <solid android:color="?colorPrimary"/>
+            <corners android:radius="@dimen/medium_button_corner_radius" />
+            <stroke
+                android:color="?prominentButtonColor"
+                android:width="@dimen/border_thickness" />
+        </shape>
+    </item>
+</ripple>
diff --git a/app/src/main/res/layout/activity_blocked_contacts.xml b/app/src/main/res/layout/activity_blocked_contacts.xml
index 69d0043009..f02ad7cb31 100644
--- a/app/src/main/res/layout/activity_blocked_contacts.xml
+++ b/app/src/main/res/layout/activity_blocked_contacts.xml
@@ -4,28 +4,37 @@
     android:layout_height="match_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
-
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/recyclerView"
+    <androidx.cardview.widget.CardView
+        android:id="@+id/cardView"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintBottom_toTopOf="@+id/unblockButton"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:background="@drawable/preference_single_no_padding"
-        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+        app:cardCornerRadius="?preferenceCornerRadius"
+        app:cardElevation="0dp"
+        app:cardBackgroundColor="?colorSettingsBackground"
         android:layout_marginHorizontal="@dimen/medium_spacing"
         android:layout_marginVertical="@dimen/large_spacing"
-        />
+        android:layout_width="match_parent"
+        android:layout_height="0dp">
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/recyclerView"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+            />
+
+    </androidx.cardview.widget.CardView>
+
 
     <TextView
         android:id="@+id/emptyStateMessageTextView"
         android:visibility="gone"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        app:layout_constraintTop_toTopOf="@+id/recyclerView"
+        app:layout_constraintTop_toTopOf="@+id/cardView"
         android:layout_marginTop="@dimen/medium_spacing"
-        app:layout_constraintStart_toStartOf="@+id/recyclerView"
-        app:layout_constraintEnd_toEndOf="@+id/recyclerView"
+        app:layout_constraintStart_toStartOf="@+id/cardView"
+        app:layout_constraintEnd_toEndOf="@+id/cardView"
         android:text="@string/blocked_contacts_empty_state"
         />
 
@@ -38,7 +47,7 @@
         android:layout_height="wrap_content"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/recyclerView"
+        app:layout_constraintTop_toBottomOf="@+id/cardView"
         android:id="@+id/unblockButton"
         app:layout_constraintBottom_toBottomOf="parent"
         android:layout_marginVertical="@dimen/large_spacing"
@@ -49,6 +58,6 @@
         android:id="@+id/nonEmptyStateGroup"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        app:constraint_referenced_ids="unblockButton,recyclerView"/>
+        app:constraint_referenced_ids="unblockButton,cardView"/>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file