diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java
index d1a9a3f1f..0a8f328ab 100644
--- a/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java
+++ b/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java
@@ -390,6 +390,10 @@ public class ConversationAdapter
             int drId = activity.getThemeResource(R.attr.ic_group_16, R.drawable.ic_group_selected_black_16);
             Drawable dr = AppCompatResources.getDrawable(activity, drId);
             viewHolder.binding.conversationName.setCompoundDrawablesRelativeWithIntrinsicBounds(null, null, dr, null);
+        } else if (conversation.getMode() == Conversation.MODE_SINGLE && conversation.hasPermanentCounterpart()) {
+            int drId = activity.getThemeResource(R.attr.ic_secret_chat_16, R.drawable.ic_secret_chat_16dp_black);
+            Drawable dr = AppCompatResources.getDrawable(activity, drId);
+            viewHolder.binding.conversationName.setCompoundDrawablesRelativeWithIntrinsicBounds(null, null, dr, null);
         } else {
             viewHolder.binding.conversationName.setCompoundDrawablesRelativeWithIntrinsicBounds(null, null, null, null);
         }
diff --git a/src/main/res/drawable/ic_secret_chat_16dp_black.xml b/src/main/res/drawable/ic_secret_chat_16dp_black.xml
new file mode 100644
index 000000000..44fa7de58
--- /dev/null
+++ b/src/main/res/drawable/ic_secret_chat_16dp_black.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="16dp"
+    android:height="16dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+    <path
+        android:fillColor="#000000"
+        android:pathData="M263.72,864Q234,864 213,842.85Q192,821.7 192,792L192,408Q192,378.3 213.15,357.15Q234.3,336 264,336L288,336L288,240Q288,160.32 344.23,104.16Q400.45,48 480.23,48Q560,48 616,104.16Q672,160.32 672,240L672,336L696,336Q725.7,336 746.85,357.15Q768,378.3 768,408L768,792Q768,821.7 746.84,842.85Q725.68,864 695.96,864L263.72,864ZM264,792L696,792Q696,792 696,792Q696,792 696,792L696,408Q696,408 696,408Q696,408 696,408L264,408Q264,408 264,408Q264,408 264,408L264,792Q264,792 264,792Q264,792 264,792ZM480.21,672Q510,672 531,650.79Q552,629.58 552,599.79Q552,570 530.79,549Q509.58,528 479.79,528Q450,528 429,549.21Q408,570.42 408,600.21Q408,630 429.21,651Q450.42,672 480.21,672ZM360,336L600,336L600,240Q600,190 565,155Q530,120 480,120Q430,120 395,155Q360,190 360,240L360,336ZM264,792Q264,792 264,792Q264,792 264,792L264,408Q264,408 264,408Q264,408 264,408L264,408Q264,408 264,408Q264,408 264,408L264,792Q264,792 264,792Q264,792 264,792Z"/>
+</vector>
diff --git a/src/main/res/drawable/ic_secret_chat_16dp_white.xml b/src/main/res/drawable/ic_secret_chat_16dp_white.xml
new file mode 100644
index 000000000..0f704750e
--- /dev/null
+++ b/src/main/res/drawable/ic_secret_chat_16dp_white.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="16dp"
+    android:height="16dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M263.72,864Q234,864 213,842.85Q192,821.7 192,792L192,408Q192,378.3 213.15,357.15Q234.3,336 264,336L288,336L288,240Q288,160.32 344.23,104.16Q400.45,48 480.23,48Q560,48 616,104.16Q672,160.32 672,240L672,336L696,336Q725.7,336 746.85,357.15Q768,378.3 768,408L768,792Q768,821.7 746.84,842.85Q725.68,864 695.96,864L263.72,864ZM264,792L696,792Q696,792 696,792Q696,792 696,792L696,408Q696,408 696,408Q696,408 696,408L264,408Q264,408 264,408Q264,408 264,408L264,792Q264,792 264,792Q264,792 264,792ZM480.21,672Q510,672 531,650.79Q552,629.58 552,599.79Q552,570 530.79,549Q509.58,528 479.79,528Q450,528 429,549.21Q408,570.42 408,600.21Q408,630 429.21,651Q450.42,672 480.21,672ZM360,336L600,336L600,240Q600,190 565,155Q530,120 480,120Q430,120 395,155Q360,190 360,240L360,336ZM264,792Q264,792 264,792Q264,792 264,792L264,408Q264,408 264,408Q264,408 264,408L264,408Q264,408 264,408Q264,408 264,408L264,792Q264,792 264,792Q264,792 264,792Z"/>
+</vector>
diff --git a/src/main/res/values/attrs.xml b/src/main/res/values/attrs.xml
index 6f9eccd42..80d8ca107 100644
--- a/src/main/res/values/attrs.xml
+++ b/src/main/res/values/attrs.xml
@@ -134,6 +134,7 @@
     <attr name="ic_group_unselected" format="reference" />
     <attr name="ic_group_selected" format="reference" />
     <attr name="ic_group_16" format="reference" />
+    <attr name="ic_secret_chat_16" format="reference" />
 
     <attr name="dialog_horizontal_padding" format="dimension" />
     <attr name="dialog_vertical_padding" format="dimension" />
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 0acfa1d30..cc38d86d0 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -1092,7 +1092,7 @@
     <string name="filter">filter</string>
     <string name="could_not_create_file">could_not_create_file</string>
     <string name="secret_chat_title">%1$s (Secret Chat / %2$s)</string>
-    <string name="secret_chat_title_no_resource">%1$s (Secret Chat / %2$s)</string>
+    <string name="secret_chat_title_no_resource">%1$s (Secret Chat)</string>
     <string name="muc_private_conversation_title">%1$s (%2$s)</string>
     <string name="note_to_self_conversation_title">Note to self (%1$s)</string>
     <string name="muc_private_conversation_info_title">Private conversation with:</string>
diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml
index 74462aa2f..773f8cd15 100644
--- a/src/main/res/values/themes.xml
+++ b/src/main/res/values/themes.xml
@@ -153,6 +153,7 @@
         <item name="ic_group_unselected" type="reference">@drawable/outline_group_black_24dp</item>
         <item name="ic_group_selected" type="reference">@drawable/ic_group_selected_black_24</item>
         <item name="ic_group_16" type="reference">@drawable/ic_group_selected_black_16</item>
+        <item name="ic_secret_chat_16" type="reference">@drawable/ic_secret_chat_16dp_black</item>
 
         <item name="icon_notifications" type="reference">@drawable/ic_notifications_black_24dp
         </item>
@@ -331,6 +332,7 @@
         <item name="ic_group_unselected" type="reference">@drawable/outline_group_white_24</item>
         <item name="ic_group_selected" type="reference">@drawable/ic_group_selected_white_24</item>
         <item name="ic_group_16" type="reference">@drawable/ic_group_selected_white_16</item>
+        <item name="ic_secret_chat_16" type="reference">@drawable/ic_secret_chat_16dp_white</item>
 
         <item name="icon_notifications" type="reference">@drawable/ic_notifications_white_24dp
         </item>