diff --git a/src/cheogram/res/drawable/thread_hint.xml b/src/cheogram/res/drawable/thread_hint.xml
index 01e251efae101d2929f8dfd67fc365b8bf314bfb..3f6a58459eac752371b31374f06a7e1739b91dcf 100644
--- a/src/cheogram/res/drawable/thread_hint.xml
+++ b/src/cheogram/res/drawable/thread_hint.xml
@@ -1,16 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
-    <corners
-        android:topLeftRadius="15dp"
-        android:topRightRadius="15dp"
-        android:bottomRightRadius="15dp"
-        android:bottomLeftRadius="15dp" />
-    <padding
-        android:bottom="2dp"
-        android:left="6dp"
-        android:right="6dp"
-        android:top="2dp" />
-    <stroke
-        android:width="1dp"
-        android:color="?attr/colorAccent" />
-</shape>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:top="0dp" android:left="0dp">
+        <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+            <corners
+                android:topLeftRadius="15dp"
+                android:topRightRadius="15dp"
+                android:bottomRightRadius="15dp"
+                android:bottomLeftRadius="15dp" />
+            <padding
+                android:bottom="2dp"
+                android:left="6dp"
+                android:right="6dp"
+                android:top="2dp" />
+            <stroke
+                android:width="1dp"
+                android:color="?attr/colorAccent" />
+        </shape>
+    </item>
+    <item
+        android:drawable="@drawable/ic_thread"
+        android:width="23dp"
+        android:height="23dp"
+        android:top="2dp"
+        android:left="-2dp" />
+</layer-list>
diff --git a/src/main/res/drawable/ic_thread.xml b/src/main/res/drawable/ic_thread.xml
new file mode 100644
index 0000000000000000000000000000000000000000..a603aeed578c374ba08657ed51f1cd39372449ed
--- /dev/null
+++ b/src/main/res/drawable/ic_thread.xml
@@ -0,0 +1,10 @@
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="23.99958dp"
+    android:viewportHeight="501.85345"
+    android:viewportWidth="501.84467"
+    android:tint="?colorControlNormal"
+    >
+    <path android:fillColor="#22ffffff" android:pathData="m 302.23322,0 c -4.78699,0 -9.28464,1.8687576 -12.6725,5.2397113 l -5.75932,5.7680437 c -3.644,3.660954 -5.53835,8.721108 -5.19735,13.850033 l 4.59924,68.846442 -42.65038,42.65038 93.51732,14.81324 20.52272,20.52397 -122.15692,-19.35391 -8.47201,-1.28345 -41.41179,42.60053 h -0.071 l -1.84418,1.96879 -21.83109,22.45911 0.009,0.01 -28.30566,28.30565 159.29844,59.40624 10.75231,3.33697 -1.60867,3.50768 -4.83225,12.96283 -176.87047,-65.95432 -23.544429,23.54693 -68.846442,-4.59176 c -5.085925,-0.324 -10.189015,1.54495 -13.874955,5.20482 l -5.7344004,5.75185 C 1.8524844,292.94863 0,297.46301 0,302.251 c 0,4.78686 1.8604844,9.27509 5.2484336,12.64509 L 186.94836,496.59629 c 3.37897,3.38799 7.88453,5.25715 12.66253,5.25715 4.38586,-0.043 9.2845,-1.86057 12.6725,-5.24843 l 5.75932,-5.75932 c 3.64388,-3.661 5.54735,-8.71344 5.19735,-13.84131 l -4.59924,-68.85517 67.93432,-67.92684 32.90614,-33.12046 0.004,0.005 8.20161,-8.15675 -0.0523,-0.0536 49.40531,-49.72555 -0.0237,-0.0212 13.49615,-13.57964 -117.77949,-26.44154 -13.40519,-16.19264 3.42668,-3.52637 142.6298,32.00773 2.76503,-2.76503 68.83772,4.59176 c 0.401,0.026 0.80242,0.0424 1.21242,0.0424 4.71885,0 9.26653,-1.8762 12.66253,-5.24719 l 5.72692,-5.74312 c 3.396,-3.379 5.25591,-7.87606 5.25591,-12.65506 -10e-4,-4.79785 -1.86055,-9.30419 -5.24843,-12.69119 L 314.90447,5.2559101 C 311.52562,1.8679705 307.02827,0 302.24942,0 Z m 0.59687,17.312853 181.70023,181.700227 -0.009,1.20495 -5.71695,5.73315 c -0.179,0.179 -0.4094,0.30769 -0.6654,0.25669 l -69.53053,-4.63412 -108.32185,-108.321842 -4.40235,-70.185964 5.74188,-5.743122 z m -192.99957,275.431877 154.10359,52.71859 -5.5126,16.15402 -121.17253,-41.4554 z m -86.176732,2.89212 c 0.017,0 0.04281,0.01 0.05981,0.01 l 69.52181,4.63412 5.213545,5.21354 2.115817,2.11582 100.99248,100.99248 4.40235,70.18721 -5.74312,5.73315 -1.20246,0.01 -181.700222,-181.70023 0.0087,-1.19497 5.716955,-5.7344 c 0.171,-0.179 0.393312,-0.26542 0.614311,-0.26542 z"/>
+</vector>
diff --git a/src/main/res/layout/item_message_received.xml b/src/main/res/layout/item_message_received.xml
index 49a69cbee99b8b4ad9c646ce6be6f7988af597ae..fd4be7491e0674e967eaaf993c820fd37d7a8f42 100644
--- a/src/main/res/layout/item_message_received.xml
+++ b/src/main/res/layout/item_message_received.xml
@@ -98,6 +98,7 @@
 
                     <com.lelloman.identicon.view.GithubIdenticonView
                         android:id="@+id/thread_identicon"
+                        android:background="@drawable/ic_thread"
                         android:visibility="gone"
                         android:layout_width="9dp"
                         android:layout_height="9dp"
diff --git a/src/main/res/layout/item_message_sent.xml b/src/main/res/layout/item_message_sent.xml
index 736d147b28b4bc1e004165888f204187b2514dc6..2ce36112c77b6fded31655ce84d5b47754f74a7e 100644
--- a/src/main/res/layout/item_message_sent.xml
+++ b/src/main/res/layout/item_message_sent.xml
@@ -89,6 +89,7 @@
 
                     <com.lelloman.identicon.view.GithubIdenticonView
                         android:id="@+id/thread_identicon"
+                        android:background="@drawable/ic_thread"
                         android:visibility="gone"
                         android:layout_width="9dp"
                         android:layout_height="9dp"