diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/conversations/ConversationsAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/conversations/ConversationsAdapter.kt
index f35caac4b..b9a05e44a 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/conversations/ConversationsAdapter.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/conversations/ConversationsAdapter.kt
@@ -18,9 +18,12 @@
  */
 package com.moez.QKSMS.feature.conversations
 
+import android.animation.AnimatorInflater
+import android.animation.AnimatorSet
 import android.content.Context
 import android.graphics.Typeface
 import android.view.LayoutInflater
+import android.view.View
 import android.view.ViewGroup
 import androidx.core.view.isVisible
 import com.moez.QKSMS.R
@@ -70,7 +73,11 @@ class ConversationsAdapter @Inject constructor(
             view.setOnClickListener {
                 val conversation = getItem(adapterPosition) ?: return@setOnClickListener
                 when (toggleSelection(conversation.id, false)) {
-                    true -> view.isActivated = isSelected(conversation.id)
+                    true -> {
+                        view.isActivated = isSelected(conversation.id)
+                        // add selection image
+                        flipAvatarPic(view)
+                    }
                     false -> navigator.showConversation(conversation.id)
                 }
             }
@@ -78,6 +85,8 @@ class ConversationsAdapter @Inject constructor(
                 val conversation = getItem(adapterPosition) ?: return@setOnLongClickListener true
                 toggleSelection(conversation.id)
                 view.isActivated = isSelected(conversation.id)
+                // add selection image
+                flipAvatarPic(view)
                 true
             }
         }
@@ -87,7 +96,10 @@ class ConversationsAdapter @Inject constructor(
         val conversation = getItem(position) ?: return
         val view = viewHolder.containerView
 
+        val origActivated = view.isActivated
         view.isActivated = isSelected(conversation.id)
+        // add selection image
+        if (origActivated != view.isActivated) flipAvatarPic(view)
 
         view.avatars.contacts = conversation.recipients
         view.title.collapseEnabled = conversation.recipients.size > 1
@@ -108,4 +120,24 @@ class ConversationsAdapter @Inject constructor(
     override fun getItemViewType(position: Int): Int {
         return if (getItem(position)?.unread == false) 0 else 1
     }
+
+    // add selection image
+    private fun flipAvatarPic(parentView: View) {
+        if (parentView.isActivated) {
+            animatorFlipViews(parentView.avatars, parentView.checked)
+        } else {
+            animatorFlipViews(parentView.checked, parentView.avatars)
+        }
+    }
+
+    private fun animatorFlipViews(oldView: View, newView: View) {
+        val animatorSetOldView = AnimatorInflater.loadAnimator(oldView.context, R.animator.flip_front) as AnimatorSet
+        animatorSetOldView.setTarget(oldView)
+        val animatorSetNewView = AnimatorInflater.loadAnimator(newView.context, R.animator.flip_back) as AnimatorSet
+        animatorSetNewView.setTarget(newView)
+
+        val combAnimatorSet = AnimatorSet()
+        combAnimatorSet.playSequentially(animatorSetOldView,animatorSetNewView)
+        combAnimatorSet.start()
+    }
 }
\ No newline at end of file
diff --git a/presentation/src/main/res/animator/flip_back.xml b/presentation/src/main/res/animator/flip_back.xml
new file mode 100644
index 000000000..44a13a1f5
--- /dev/null
+++ b/presentation/src/main/res/animator/flip_back.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android" android:ordering="sequentially">
+    <!-- Before rotating, immediately set the alpha to 1. -->
+    <objectAnimator
+        android:valueFrom="0.0"
+        android:valueTo="1.0"
+        android:propertyName="alpha"
+        android:duration="0" />
+
+    <!-- Rotate. -->
+    <objectAnimator
+        android:valueFrom="90"
+        android:valueTo="0"
+        android:propertyName="rotationY"
+        android:interpolator="@android:interpolator/accelerate_decelerate"
+        android:duration="200" />
+</set>
\ No newline at end of file
diff --git a/presentation/src/main/res/animator/flip_front.xml b/presentation/src/main/res/animator/flip_front.xml
new file mode 100644
index 000000000..75ec3d142
--- /dev/null
+++ b/presentation/src/main/res/animator/flip_front.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android" android:ordering="sequentially">
+    <!-- Rotate. -->
+    <objectAnimator
+        android:valueFrom="0"
+        android:valueTo="-90"
+        android:propertyName="rotationY"
+        android:interpolator="@android:interpolator/accelerate_decelerate"
+        android:duration="200" />
+
+    <!-- After rotation, set the alpha to 0. -->
+    <objectAnimator
+        android:valueFrom="1.0"
+        android:valueTo="0.0"
+        android:propertyName="alpha"
+        android:duration="1" />
+</set>
\ No newline at end of file
diff --git a/presentation/src/main/res/drawable/ic_check_circle_24dp.xml b/presentation/src/main/res/drawable/ic_check_circle_24dp.xml
new file mode 100644
index 000000000..cfdbfc787
--- /dev/null
+++ b/presentation/src/main/res/drawable/ic_check_circle_24dp.xml
@@ -0,0 +1,8 @@
+<vector android:height="24dp"
+    android:width="24dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF00838F" android:pathData="M12,0 A12,12 0 1,1 12,24 A12,12 0 1,1 12,0z"/>
+    <path android:fillColor="#FFFFFFFF" android:pathData="M10,17l-5,-5 1.41,-1.41L10,14.17l7.59,-7.59L19,8l-9,9z"/>
+</vector>
diff --git a/presentation/src/main/res/layout/conversation_list_item.xml b/presentation/src/main/res/layout/conversation_list_item.xml
index e4159c53e..911cbe657 100644
--- a/presentation/src/main/res/layout/conversation_list_item.xml
+++ b/presentation/src/main/res/layout/conversation_list_item.xml
@@ -30,6 +30,17 @@
     android:paddingEnd="16dp"
     android:paddingBottom="12dp">
 
+    <ImageView
+        android:id="@+id/checked"
+        android:layout_width="48dp"
+        android:layout_height="48dp"
+        android:alpha="0"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0"
+        app:srcCompat="@drawable/ic_check_circle_24dp" />
+
     <com.moez.QKSMS.common.widget.GroupAvatarView
         android:id="@+id/avatars"
         android:layout_width="48dp"