diff --git a/Riot/Modules/Room/NotificationSettings/RoomNotificationSettingsAvatarView.swift b/Riot/Modules/Room/NotificationSettings/RoomNotificationSettingsAvatarView.swift
index c9bf9af89..744bfa2b6 100644
--- a/Riot/Modules/Room/NotificationSettings/RoomNotificationSettingsAvatarView.swift
+++ b/Riot/Modules/Room/NotificationSettings/RoomNotificationSettingsAvatarView.swift
@@ -19,26 +19,18 @@ import Reusable
 
 class RoomNotificationSettingsAvatarView: UIView {
     
-    @IBOutlet weak var avatarView: MXKImageView!
+    @IBOutlet weak var avatarView: RoomAvatarView!
     @IBOutlet weak var nameLabel: UILabel!
     
     func configure(viewData: AvatarViewDataProtocol) {
-        let avatarImage = AvatarGenerator.generateAvatar(forMatrixItem: viewData.matrixItemId, withDisplayName: viewData.displayName)
+        avatarView.fill(with: viewData)
         
-        if let avatarUrl = viewData.avatarUrl {
-            avatarView.enableInMemoryCache = true
-
-            avatarView.setImageURI(avatarUrl,
-                                        withType: nil,
-                                        andImageOrientation: .up,
-                                        toFitViewSize: avatarView.frame.size,
-                                        with: MXThumbnailingMethodCrop,
-                                        previewImage: avatarImage,
-                                        mediaManager: viewData.mediaManager)
-        } else {
-            avatarView.image = avatarImage
+        switch viewData.fallbackImage {
+        case .matrixItem(_, let matrixItemDisplayName):
+            nameLabel.text = matrixItemDisplayName
+        default:
+            nameLabel.text = nil
         }
-        nameLabel.text = viewData.displayName
     }
 }
 
diff --git a/Riot/Modules/Room/NotificationSettings/RoomNotificationSettingsAvatarView.xib b/Riot/Modules/Room/NotificationSettings/RoomNotificationSettingsAvatarView.xib
index b9c21f892..7ee782fdd 100644
--- a/Riot/Modules/Room/NotificationSettings/RoomNotificationSettingsAvatarView.xib
+++ b/Riot/Modules/Room/NotificationSettings/RoomNotificationSettingsAvatarView.xib
@@ -14,7 +14,7 @@
             <rect key="frame" x="0.0" y="0.0" width="414" height="192"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES"/>
             <subviews>
-                <view autoresizesSubviews="NO" clipsSubviews="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="q3Z-S1-Py9" customClass="MXKImageView">
+                <view autoresizesSubviews="NO" clipsSubviews="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="q3Z-S1-Py9" customClass="RoomAvatarView" customModule="Riot" customModuleProvider="target">
                     <rect key="frame" x="167" y="20" width="80" height="80"/>
                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                     <constraints>