diff --git a/vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheet.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheet.kt
index eb20e815f6..c5ffb015bf 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheet.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheet.kt
@@ -49,6 +49,7 @@ import im.vector.app.features.crypto.verification.request.VerificationRequestFra
 import im.vector.app.features.home.AvatarRenderer
 import im.vector.app.features.settings.VectorSettingsActivity
 import kotlinx.parcelize.Parcelize
+import org.matrix.android.sdk.api.crypto.RoomEncryptionTrustLevel
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.crypto.crosssigning.KEYBACKUP_SECRET_SSSS_NAME
 import org.matrix.android.sdk.api.session.crypto.crosssigning.MASTER_KEY_SSSS_NAME
@@ -162,23 +163,22 @@ class VerificationBottomSheet : VectorBaseBottomSheetDialogFragment<BottomSheetV
                 if (state.sasTransactionState == VerificationTxState.Verified
                         || state.qrTransactionState == VerificationTxState.Verified
                         || state.verifiedFromPrivateKeys) {
-                    views.otherUserShield.setImageResource(R.drawable.ic_shield_trusted)
+                    views.otherUserShield.render(RoomEncryptionTrustLevel.Trusted)
                 } else {
-                    views.otherUserShield.setImageResource(R.drawable.ic_shield_warning)
+                    views.otherUserShield.render(RoomEncryptionTrustLevel.Warning)
                 }
                 views.otherUserNameText.text = getString(
                         if (state.selfVerificationMode) R.string.crosssigning_verify_this_session else R.string.crosssigning_verify_session
                 )
-                views.otherUserShield.isVisible = true
             } else {
                 avatarRenderer.render(matrixItem, views.otherUserAvatarImageView)
 
                 if (state.sasTransactionState == VerificationTxState.Verified || state.qrTransactionState == VerificationTxState.Verified) {
                     views.otherUserNameText.text = getString(R.string.verification_verified_user, matrixItem.getBestName())
-                    views.otherUserShield.isVisible = true
+                    views.otherUserShield.render(RoomEncryptionTrustLevel.Trusted)
                 } else {
                     views.otherUserNameText.text = getString(R.string.verification_verify_user, matrixItem.getBestName())
-                    views.otherUserShield.isVisible = false
+                    views.otherUserShield.render(null)
                 }
             }
         }
diff --git a/vector/src/main/res/layout/bottom_sheet_verification.xml b/vector/src/main/res/layout/bottom_sheet_verification.xml
index c9241c4103..b3b41303ee 100644
--- a/vector/src/main/res/layout/bottom_sheet_verification.xml
+++ b/vector/src/main/res/layout/bottom_sheet_verification.xml
@@ -28,12 +28,11 @@
             app:layout_constraintTop_toTopOf="parent"
             tools:src="@tools:sample/avatars" />
 
-        <ImageView
+        <im.vector.app.core.ui.views.ShieldImageView
             android:id="@+id/otherUserShield"
             android:layout_width="16dp"
             android:layout_height="16dp"
             android:importantForAccessibility="no"
-            android:src="@drawable/ic_shield_trusted"
             app:layout_constraintCircle="@+id/otherUserAvatarImageView"
             app:layout_constraintCircleAngle="135"
             app:layout_constraintCircleRadius="16dp"
diff --git a/vector/src/main/res/layout/fragment_matrix_profile.xml b/vector/src/main/res/layout/fragment_matrix_profile.xml
index 732be11fda..cf99fbd64b 100644
--- a/vector/src/main/res/layout/fragment_matrix_profile.xml
+++ b/vector/src/main/res/layout/fragment_matrix_profile.xml
@@ -69,8 +69,7 @@
                         app:layout_constraintCircleAngle="135"
                         app:layout_constraintCircleRadius="20dp"
                         tools:alpha="1"
-                        tools:ignore="MissingConstraints"
-                        tools:src="@drawable/ic_shield_trusted" />
+                        tools:ignore="MissingConstraints" />
 
                     <TextView
                         android:id="@+id/matrixProfileToolbarTitleView"
diff --git a/vector/src/main/res/layout/fragment_room_detail.xml b/vector/src/main/res/layout/fragment_room_detail.xml
index 1f44ac7523..df36d7e225 100644
--- a/vector/src/main/res/layout/fragment_room_detail.xml
+++ b/vector/src/main/res/layout/fragment_room_detail.xml
@@ -41,8 +41,7 @@
                 app:layout_constraintCircle="@+id/roomToolbarAvatarImageView"
                 app:layout_constraintCircleAngle="135"
                 app:layout_constraintCircleRadius="20dp"
-                tools:ignore="MissingConstraints"
-                tools:src="@drawable/ic_shield_trusted" />
+                tools:ignore="MissingConstraints" />
 
             <TextView
                 android:id="@+id/roomToolbarTitleView"
diff --git a/vector/src/main/res/layout/fragment_room_uploads.xml b/vector/src/main/res/layout/fragment_room_uploads.xml
index 7c99a1ba6f..d6af178308 100644
--- a/vector/src/main/res/layout/fragment_room_uploads.xml
+++ b/vector/src/main/res/layout/fragment_room_uploads.xml
@@ -46,8 +46,7 @@
                     app:layout_constraintCircle="@+id/roomUploadsToolbarAvatarImageView"
                     app:layout_constraintCircleAngle="135"
                     app:layout_constraintCircleRadius="20dp"
-                    tools:ignore="MissingConstraints"
-                    tools:src="@drawable/ic_shield_trusted" />
+                    tools:ignore="MissingConstraints" />
 
                 <TextView
                     android:id="@+id/roomUploadsToolbarTitleView"
diff --git a/vector/src/main/res/layout/item_device.xml b/vector/src/main/res/layout/item_device.xml
index f9fd6f6088..4503159e85 100644
--- a/vector/src/main/res/layout/item_device.xml
+++ b/vector/src/main/res/layout/item_device.xml
@@ -88,8 +88,7 @@
         android:id="@+id/itemDeviceTrustLevelIcon"
         android:layout_width="50dp"
         android:layout_height="match_parent"
-        android:padding="8dp"
-        tools:src="@drawable/ic_shield_trusted" />
+        android:padding="8dp" />
 
 </LinearLayout>
 
diff --git a/vector/src/main/res/layout/item_profile_matrix_item.xml b/vector/src/main/res/layout/item_profile_matrix_item.xml
index 4a6c59ca48..d2ea7c01f5 100644
--- a/vector/src/main/res/layout/item_profile_matrix_item.xml
+++ b/vector/src/main/res/layout/item_profile_matrix_item.xml
@@ -33,8 +33,7 @@
         app:layout_constraintCircle="@+id/matrixItemAvatar"
         app:layout_constraintCircleAngle="135"
         app:layout_constraintCircleRadius="16dp"
-        tools:ignore="MissingConstraints"
-        tools:src="@drawable/ic_shield_trusted" />
+        tools:ignore="MissingConstraints" />
 
     <TextView
         android:id="@+id/matrixItemTitle"
diff --git a/vector/src/main/res/layout/item_profile_matrix_item_progress.xml b/vector/src/main/res/layout/item_profile_matrix_item_progress.xml
index 1f755cf2be..3376d58598 100644
--- a/vector/src/main/res/layout/item_profile_matrix_item_progress.xml
+++ b/vector/src/main/res/layout/item_profile_matrix_item_progress.xml
@@ -33,8 +33,7 @@
         app:layout_constraintCircle="@+id/matrixItemAvatar"
         app:layout_constraintCircleAngle="135"
         app:layout_constraintCircleRadius="16dp"
-        tools:ignore="MissingConstraints"
-        tools:src="@drawable/ic_shield_trusted" />
+        tools:ignore="MissingConstraints" />
 
     <TextView
         android:id="@+id/matrixItemTitle"
diff --git a/vector/src/main/res/layout/item_room.xml b/vector/src/main/res/layout/item_room.xml
index e0f8c12afd..4e20d270cd 100644
--- a/vector/src/main/res/layout/item_room.xml
+++ b/vector/src/main/res/layout/item_room.xml
@@ -67,8 +67,7 @@
         app:layout_constraintCircle="@id/roomAvatarContainer"
         app:layout_constraintCircleAngle="135"
         app:layout_constraintCircleRadius="28dp"
-        tools:ignore="MissingConstraints"
-        tools:src="@drawable/ic_shield_trusted" />
+        tools:ignore="MissingConstraints" />
 
     <!-- Margin bottom does not work, so I use space -->
     <Space
diff --git a/vector/src/main/res/layout/item_timeline_event_file_stub.xml b/vector/src/main/res/layout/item_timeline_event_file_stub.xml
index 6df0c02cae..ec9d79f4ec 100644
--- a/vector/src/main/res/layout/item_timeline_event_file_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_file_stub.xml
@@ -12,10 +12,10 @@
         android:id="@+id/messageFilee2eIcon"
         android:layout_width="14dp"
         android:layout_height="14dp"
-        android:src="@drawable/ic_shield_black"
         android:visibility="gone"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
+        tools:src="@drawable/ic_shield_black"
         tools:visibility="visible" />
 
     <!-- the media type -->
diff --git a/vector/src/main/res/layout/item_timeline_event_status_tile_stub.xml b/vector/src/main/res/layout/item_timeline_event_status_tile_stub.xml
index c0fdea8c9d..1a0e5c0d0d 100644
--- a/vector/src/main/res/layout/item_timeline_event_status_tile_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_status_tile_stub.xml
@@ -11,12 +11,12 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
-        tools:drawableStart="@drawable/ic_shield_trusted"
         android:drawablePadding="6dp"
         android:gravity="center"
         android:textColor="?riotx_text_primary"
         android:textSize="15sp"
         android:textStyle="bold"
+        tools:drawableStart="@drawable/ic_shield_trusted"
         tools:text="@string/sas_verified" />
 
 
diff --git a/vector/src/main/res/layout/item_verification_big_image.xml b/vector/src/main/res/layout/item_verification_big_image.xml
index 3f75186aeb..8d23f342cd 100644
--- a/vector/src/main/res/layout/item_verification_big_image.xml
+++ b/vector/src/main/res/layout/item_verification_big_image.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <im.vector.app.core.ui.views.ShieldImageView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/itemVerificationBigImage"
     android:layout_width="match_parent"
     android:layout_height="180dp"
-    android:layout_margin="8dp"
-    tools:src="@drawable/ic_shield_trusted" />
+    android:layout_margin="8dp" />
diff --git a/vector/src/main/res/layout/view_stub_room_member_profile_header.xml b/vector/src/main/res/layout/view_stub_room_member_profile_header.xml
index 027284b11b..7df09721be 100644
--- a/vector/src/main/res/layout/view_stub_room_member_profile_header.xml
+++ b/vector/src/main/res/layout/view_stub_room_member_profile_header.xml
@@ -37,8 +37,7 @@
             app:layout_constraintCircle="@+id/memberProfileAvatarView"
             app:layout_constraintCircleAngle="135"
             app:layout_constraintCircleRadius="64dp"
-            tools:ignore="MissingConstraints"
-            tools:src="@drawable/ic_shield_trusted" />
+            tools:ignore="MissingConstraints" />
 
         <TextView
             android:id="@+id/memberProfileNameView"
diff --git a/vector/src/main/res/layout/view_stub_room_profile_header.xml b/vector/src/main/res/layout/view_stub_room_profile_header.xml
index b74c0609fd..e3f16882ee 100644
--- a/vector/src/main/res/layout/view_stub_room_profile_header.xml
+++ b/vector/src/main/res/layout/view_stub_room_profile_header.xml
@@ -27,8 +27,7 @@
         app:layout_constraintCircle="@+id/roomProfileAvatarView"
         app:layout_constraintCircleAngle="135"
         app:layout_constraintCircleRadius="64dp"
-        tools:ignore="MissingConstraints"
-        tools:src="@drawable/ic_shield_trusted" />
+        tools:ignore="MissingConstraints" />
 
     <TextView
         android:id="@+id/roomProfileNameView"