diff --git a/res/css/views/dialogs/_RoomSettingsDialog.scss b/res/css/views/dialogs/_RoomSettingsDialog.scss
index 3751c15643..d4199a1e66 100644
--- a/res/css/views/dialogs/_RoomSettingsDialog.scss
+++ b/res/css/views/dialogs/_RoomSettingsDialog.scss
@@ -18,19 +18,19 @@ limitations under the License.
 // ==========================================================
 
 .mx_RoomSettingsDialog_settingsIcon::before {
-    mask-image: url('$(res)/img/feather-customised/settings.svg');
+    mask-image: url('$(res)/img/element-icons/settings.svg');
 }
 
 .mx_RoomSettingsDialog_securityIcon::before {
-    mask-image: url('$(res)/img/feather-customised/lock.svg');
+    mask-image: url('$(res)/img/element-icons/security.svg');
 }
 
 .mx_RoomSettingsDialog_rolesIcon::before {
-    mask-image: url('$(res)/img/feather-customised/users-sm.svg');
+    mask-image: url('$(res)/img/element-icons/room/settings/roles.svg');
 }
 
 .mx_RoomSettingsDialog_notificationsIcon::before {
-    mask-image: url('$(res)/img/feather-customised/notifications.svg');
+    mask-image: url('$(res)/img/element-icons/notifications.svg');
 }
 
 .mx_RoomSettingsDialog_bridgesIcon::before {
@@ -39,7 +39,7 @@ limitations under the License.
 }
 
 .mx_RoomSettingsDialog_warningIcon::before {
-    mask-image: url('$(res)/img/feather-customised/warning-triangle.svg');
+    mask-image: url('$(res)/img/element-icons/room/settings/advanced.svg');
 }
 
 .mx_RoomSettingsDialog .mx_Dialog_title {
diff --git a/res/img/element-icons/advanced.svg b/res/img/element-icons/room/settings/advanced.svg
similarity index 100%
rename from res/img/element-icons/advanced.svg
rename to res/img/element-icons/room/settings/advanced.svg
diff --git a/res/img/element-icons/room/settings/roles.svg b/res/img/element-icons/room/settings/roles.svg
new file mode 100644
index 0000000000..24bccf78f4
--- /dev/null
+++ b/res/img/element-icons/room/settings/roles.svg
@@ -0,0 +1,3 @@
+<svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M6.29794 15.1653H4.87499C3.51012 15.1653 2.83495 14.4974 2.83495 13.1254V11.7027C2.83495 11.601 2.80591 11.5212 2.73331 11.4486L1.72418 10.4396C0.758607 9.47411 0.758607 8.53043 1.72418 7.56497L2.73331 6.55595C2.80591 6.4761 2.83495 6.40351 2.83495 6.30188V4.87183C2.83495 3.49986 3.50286 2.83928 4.87499 2.83928H6.29794C6.40684 2.83928 6.47944 2.81024 6.55204 2.73039L7.56117 1.7359C8.52674 0.755915 9.47053 0.755915 10.4434 1.72864L11.4452 2.73039C11.5251 2.81024 11.5977 2.83928 11.7066 2.83928H13.1295C14.4944 2.83928 15.1623 3.50712 15.1623 4.87183V6.30188C15.1623 6.40351 15.1914 6.4761 15.2712 6.55595L16.2731 7.56497C17.2387 8.53043 17.2459 9.47411 16.2731 10.4396L15.2712 11.4486C15.1986 11.5212 15.1623 11.601 15.1623 11.7027V13.1254C15.1623 14.4902 14.4944 15.1653 13.1295 15.1653H11.7066C11.5977 15.1653 11.5324 15.187 11.4452 15.2669L10.4434 16.2759C9.47053 17.2414 8.52674 17.2414 7.56117 16.2759L6.55204 15.2669C6.47218 15.187 6.40684 15.1653 6.29794 15.1653ZM11.7631 6.11992C11.9397 5.95256 12.2186 5.96186 12.386 6.13851C12.5347 6.30586 12.5347 6.55689 12.4046 6.72425L8.48108 11.4752L8.45319 11.5124C8.19286 11.8285 7.7187 11.875 7.40259 11.6147C7.37451 11.6006 7.35173 11.576 7.33025 11.5528C7.32328 11.5452 7.31645 11.5378 7.30961 11.531L5.62678 9.59714C5.44083 9.374 5.45943 9.0393 5.68257 8.85335C5.86852 8.686 6.13814 8.686 6.33338 8.81616L7.79308 9.83887L11.7631 6.11992Z" fill="black"/>
+</svg>