diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
index 66c60ca535665479f023ecb40bbe3beae28811c4..d09c70ea30c878b1791918480564dc3d49b53924 100644
--- a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
+++ b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
@@ -211,31 +211,24 @@ public class MessageAdapter extends ArrayAdapter<Message> implements CopyTextVie
 		if (message.getEncryption() == Message.ENCRYPTION_NONE) {
 			viewHolder.indicator.setVisibility(View.GONE);
 		} else {
-			viewHolder.indicator.setImageResource(darkBackground ? R.drawable.ic_lock_white_18dp : R.drawable.ic_lock_black_18dp);
-			viewHolder.indicator.setVisibility(View.VISIBLE);
+			boolean verified = false;
 			if (message.getEncryption() == Message.ENCRYPTION_AXOLOTL) {
-				FingerprintStatus status = message.getConversation()
+				final FingerprintStatus status = message.getConversation()
 						.getAccount().getAxolotlService().getFingerprintTrust(
 								message.getFingerprint());
-
-				if(status == null || (type == SENT ? !status.isTrusted() : (!status.isVerified() && inValidSession))) {
-					viewHolder.indicator.setColorFilter(0xffc64545);
-					viewHolder.indicator.setAlpha(1.0f);
-				} else {
-					viewHolder.indicator.clearColorFilter();
-					if (darkBackground) {
-						viewHolder.indicator.setAlpha(0.7f);
-					} else {
-						viewHolder.indicator.setAlpha(0.57f);
-					}
+				if (status != null && status.isVerified()) {
+					verified = true;
 				}
+			}
+			if (verified) {
+				viewHolder.indicator.setImageResource(darkBackground ? R.drawable.ic_verified_user_white_18dp : R.drawable.ic_verified_user_black_18dp);
 			} else {
-				viewHolder.indicator.clearColorFilter();
-				if (darkBackground) {
-					viewHolder.indicator.setAlpha(0.7f);
-				} else {
-					viewHolder.indicator.setAlpha(0.57f);
-				}
+				viewHolder.indicator.setImageResource(darkBackground ? R.drawable.ic_lock_white_18dp : R.drawable.ic_lock_black_18dp);
+			}
+			if (darkBackground) {
+				viewHolder.indicator.setAlpha(0.7f);
+			} else {
+				viewHolder.indicator.setAlpha(0.57f);
 			}
 		}
 
diff --git a/src/main/res/drawable-hdpi/ic_lock_black_18dp.png b/src/main/res/drawable-hdpi/ic_lock_black_18dp.png
index 4c7a7c59f27adcb7e14766d40485f62ee0b27240..f314292779a8a90a8f4fa398f7be0f7a7ed87112 100644
Binary files a/src/main/res/drawable-hdpi/ic_lock_black_18dp.png and b/src/main/res/drawable-hdpi/ic_lock_black_18dp.png differ
diff --git a/src/main/res/drawable-hdpi/ic_lock_white_18dp.png b/src/main/res/drawable-hdpi/ic_lock_white_18dp.png
index 29e8bfd32c1a30e6d7793a0675ec753bf62d8e04..f5f861418b250d52cda6c35f4199c68d9961dc1b 100644
Binary files a/src/main/res/drawable-hdpi/ic_lock_white_18dp.png and b/src/main/res/drawable-hdpi/ic_lock_white_18dp.png differ
diff --git a/src/main/res/drawable-hdpi/ic_verified_user_black_18dp.png b/src/main/res/drawable-hdpi/ic_verified_user_black_18dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..48e38bf9a5b4ac71176658510d49e1a702faaf8c
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_verified_user_black_18dp.png differ
diff --git a/src/main/res/drawable-hdpi/ic_verified_user_white_18dp.png b/src/main/res/drawable-hdpi/ic_verified_user_white_18dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..1e252c0d2310332078c88e5ef48572c97a0f88c3
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_verified_user_white_18dp.png differ
diff --git a/src/main/res/drawable-mdpi/ic_lock_black_18dp.png b/src/main/res/drawable-mdpi/ic_lock_black_18dp.png
index c8b6fe7125dfb51b1334b4c04a4c4a792b50a1f3..317c034b9b4780f4e94966b8acf30c7ea75852ea 100644
Binary files a/src/main/res/drawable-mdpi/ic_lock_black_18dp.png and b/src/main/res/drawable-mdpi/ic_lock_black_18dp.png differ
diff --git a/src/main/res/drawable-mdpi/ic_lock_white_18dp.png b/src/main/res/drawable-mdpi/ic_lock_white_18dp.png
index 1265e98e101c6896f3ea29d04d88517def1e3bf9..b9666133628fb7cb16343cf879db097d2afb8193 100644
Binary files a/src/main/res/drawable-mdpi/ic_lock_white_18dp.png and b/src/main/res/drawable-mdpi/ic_lock_white_18dp.png differ
diff --git a/src/main/res/drawable-mdpi/ic_verified_user_black_18dp.png b/src/main/res/drawable-mdpi/ic_verified_user_black_18dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..59964fb0b3b26e0bf9c5c8ba4eb64eb4720ba404
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_verified_user_black_18dp.png differ
diff --git a/src/main/res/drawable-mdpi/ic_verified_user_white_18dp.png b/src/main/res/drawable-mdpi/ic_verified_user_white_18dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..81f1f41f5a1ff75639dc0319fcdaa82dccbfb6d1
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_verified_user_white_18dp.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_lock_black_18dp.png b/src/main/res/drawable-xhdpi/ic_lock_black_18dp.png
index 0888c6173dfb99c04a6b473a889af14221e5eee2..de50295914715a5ef39d2c11a5db72364b886bc0 100644
Binary files a/src/main/res/drawable-xhdpi/ic_lock_black_18dp.png and b/src/main/res/drawable-xhdpi/ic_lock_black_18dp.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_lock_white_18dp.png b/src/main/res/drawable-xhdpi/ic_lock_white_18dp.png
index b94735ecbb6043e2842514aaed9124dbcf18d34f..cd4f04aa1d0283908902ad51f4a9289d5ef7dc13 100644
Binary files a/src/main/res/drawable-xhdpi/ic_lock_white_18dp.png and b/src/main/res/drawable-xhdpi/ic_lock_white_18dp.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_verified_user_black_18dp.png b/src/main/res/drawable-xhdpi/ic_verified_user_black_18dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..8ebb6db35b6608a302ff3281a2906fd703831e98
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_verified_user_black_18dp.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_verified_user_white_18dp.png b/src/main/res/drawable-xhdpi/ic_verified_user_white_18dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..3e3792f86cb3bc9416368a7d7e98b5843369a324
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_verified_user_white_18dp.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_lock_black_18dp.png b/src/main/res/drawable-xxhdpi/ic_lock_black_18dp.png
index dbcf3f33d3d5be7d45ff06ad9b8e7c4ccc1bc51c..17e815894bf4e64a8c15267418a99c941092fa39 100644
Binary files a/src/main/res/drawable-xxhdpi/ic_lock_black_18dp.png and b/src/main/res/drawable-xxhdpi/ic_lock_black_18dp.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_lock_white_18dp.png b/src/main/res/drawable-xxhdpi/ic_lock_white_18dp.png
index 895aabbfab5b03d0783e7573f44521ec6608439e..47bd6411cf265ec228678cc05a3ba1fa58ed34a6 100644
Binary files a/src/main/res/drawable-xxhdpi/ic_lock_white_18dp.png and b/src/main/res/drawable-xxhdpi/ic_lock_white_18dp.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_verified_user_black_18dp.png b/src/main/res/drawable-xxhdpi/ic_verified_user_black_18dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..1244f932a6774fe7fb404ac34593464c428d9529
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_verified_user_black_18dp.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_verified_user_white_18dp.png b/src/main/res/drawable-xxhdpi/ic_verified_user_white_18dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..ea938a6e9864771f862f12499330546d65b007d8
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_verified_user_white_18dp.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_lock_black_18dp.png b/src/main/res/drawable-xxxhdpi/ic_lock_black_18dp.png
index c49d420e0b12568c3b8a16db4377cfde1fbae142..a7caa2db8b5562689f5e1e324ed84987801d4b5e 100644
Binary files a/src/main/res/drawable-xxxhdpi/ic_lock_black_18dp.png and b/src/main/res/drawable-xxxhdpi/ic_lock_black_18dp.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_lock_white_18dp.png b/src/main/res/drawable-xxxhdpi/ic_lock_white_18dp.png
index 0dcada814e6f4d28ec42e679c91ece10184ed097..0e52c7c75e58cc7700cedf8e808fcb4f598a2f54 100644
Binary files a/src/main/res/drawable-xxxhdpi/ic_lock_white_18dp.png and b/src/main/res/drawable-xxxhdpi/ic_lock_white_18dp.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_verified_user_black_18dp.png b/src/main/res/drawable-xxxhdpi/ic_verified_user_black_18dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..70a9fc1bf240eb0089c721fe211ef7a2ee313a1d
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_verified_user_black_18dp.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_verified_user_white_18dp.png b/src/main/res/drawable-xxxhdpi/ic_verified_user_white_18dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..ec35ec7abb805d19bff0041404eec0aca8f75c65
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_verified_user_white_18dp.png differ