diff --git a/res/css/structures/_RightPanel.scss b/res/css/structures/_RightPanel.scss
index 600871e071..da9303d8aa 100644
--- a/res/css/structures/_RightPanel.scss
+++ b/res/css/structures/_RightPanel.scss
@@ -67,17 +67,17 @@ limitations under the License.
 }
 
 .mx_RightPanel_membersButton::before {
-    mask-image: url('$(res)/img/feather-customised/user.svg');
+    mask-image: url('$(res)/img/element-icons/room/members.svg');
     mask-position: center;
 }
 
 .mx_RightPanel_filesButton::before {
-    mask-image: url('$(res)/img/feather-customised/files.svg');
+    mask-image: url('$(res)/img/element-icons/room/files.svg');
     mask-position: center;
 }
 
 .mx_RightPanel_notifsButton::before {
-    mask-image: url('$(res)/img/feather-customised/notifications.svg');
+    mask-image: url('$(res)/img/element-icons/notifications.svg');
     mask-position: center;
 }
 
diff --git a/res/css/views/rooms/_MessageComposer.scss b/res/css/views/rooms/_MessageComposer.scss
index c1cda7bf24..a05457fea4 100644
--- a/res/css/views/rooms/_MessageComposer.scss
+++ b/res/css/views/rooms/_MessageComposer.scss
@@ -199,7 +199,7 @@ limitations under the License.
 }
 
 .mx_MessageComposer_upload::before {
-    mask-image: url('$(res)/img/feather-customised/paperclip.svg');
+    mask-image: url('$(res)/img/element-icons/room/composer/attach.svg');
 }
 
 .mx_MessageComposer_hangup::before {
@@ -207,19 +207,19 @@ limitations under the License.
 }
 
 .mx_MessageComposer_voicecall::before {
-    mask-image: url('$(res)/img/feather-customised/phone.svg');
+    mask-image: url('$(res)/img/element-icons/room/composer/voice-call.svg');
 }
 
 .mx_MessageComposer_videocall::before {
-    mask-image: url('$(res)/img/feather-customised/video.svg');
+    mask-image: url('$(res)/img/element-icons/video-call.svg');
 }
 
 .mx_MessageComposer_emoji::before {
-    mask-image: url('$(res)/img/feather-customised/emoji3.custom.svg');
+    mask-image: url('$(res)/img/element-icons/room/composer/emoji.svg');
 }
 
 .mx_MessageComposer_stickers::before {
-    mask-image: url('$(res)/img/feather-customised/sticker.custom.svg');
+    mask-image: url('$(res)/img/element-icons/room/composer/sticker.svg');
 }
 
 .mx_MessageComposer_formatting {
diff --git a/res/css/views/rooms/_RoomHeader.scss b/res/css/views/rooms/_RoomHeader.scss
index a047a6f9b4..c3c7ff0278 100644
--- a/res/css/views/rooms/_RoomHeader.scss
+++ b/res/css/views/rooms/_RoomHeader.scss
@@ -218,24 +218,24 @@ limitations under the License.
 }
 
 .mx_RoomHeader_settingsButton::before {
-    mask-image: url('$(res)/img/feather-customised/settings.svg');
+    mask-image: url('$(res)/img/element-icons/settings.svg');
 }
 
 .mx_RoomHeader_forgetButton::before {
-    mask-image: url('$(res)/img/leave.svg');
+    mask-image: url('$(res)/img/element-icons/leave.svg');
     width: 26px;
 }
 
 .mx_RoomHeader_searchButton::before {
-    mask-image: url('$(res)/img/feather-customised/search.svg');
+    mask-image: url('$(res)/img/element-icons/room/search-inset.svg');
 }
 
 .mx_RoomHeader_shareButton::before {
-    mask-image: url('$(res)/img/feather-customised/share.svg');
+    mask-image: url('$(res)/img/element-icons/room/share.svg');
 }
 
 .mx_RoomHeader_manageIntegsButton::before {
-    mask-image: url('$(res)/img/feather-customised/grid.svg');
+    mask-image: url('$(res)/img/element-icons/room/integrations.svg');
 }
 
 .mx_RoomHeader_showPanel {
@@ -251,7 +251,7 @@ limitations under the License.
 }
 
 .mx_RoomHeader_pinnedButton::before {
-    mask-image: url('$(res)/img/icons-pin.svg');
+    mask-image: url('$(res)/img/element-icons/room/pin.svg');
 }
 
 .mx_RoomHeader_pinsIndicator {