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 66c60ca53..d09c70ea3 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 4c7a7c59f..f31429277 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 29e8bfd32..f5f861418 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 000000000..48e38bf9a
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 000000000..1e252c0d2
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 c8b6fe712..317c034b9 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 1265e98e1..b96661336 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 000000000..59964fb0b
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 000000000..81f1f41f5
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 0888c6173..de5029591 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 b94735ecb..cd4f04aa1 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 000000000..8ebb6db35
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 000000000..3e3792f86
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 dbcf3f33d..17e815894 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 895aabbfa..47bd6411c 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 000000000..1244f932a
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 000000000..ea938a6e9
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 c49d420e0..a7caa2db8 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 0dcada814..0e52c7c75 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 000000000..70a9fc1bf
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 000000000..ec35ec7ab
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_verified_user_white_18dp.png differ