diff --git a/res/css/views/context_menus/_MessageContextMenu.scss b/res/css/views/context_menus/_MessageContextMenu.scss
index c22518387a..4900488bb8 100644
--- a/res/css/views/context_menus/_MessageContextMenu.scss
+++ b/res/css/views/context_menus/_MessageContextMenu.scss
@@ -38,7 +38,7 @@ limitations under the License.
     }
 
     .mx_MessageContextMenu_iconReport::before {
-        mask-image: url('$(res)/img/feather-customised/warning-triangle.svg');
+        mask-image: url('$(res)/img/element-icons/warning-badge.svg');
     }
 
     .mx_MessageContextMenu_iconLink::before {
@@ -46,7 +46,7 @@ limitations under the License.
     }
 
     .mx_MessageContextMenu_iconPermalink::before {
-        mask-image: url('$(res)/img/element-icons/message/share.svg');
+        mask-image: url('$(res)/img/element-icons/room/share.svg');
     }
 
     .mx_MessageContextMenu_iconUnhidePreview::before {
@@ -54,20 +54,11 @@ limitations under the License.
     }
 
     .mx_MessageContextMenu_iconForward::before {
-        mask-image: url('$(res)/img/element-icons/message/corner-up-right.svg');
-    }
-
-    .mx_MessageContextMenu_iconCancel::before {
-        height: 12px;
-        left: 2px;
-        mask-image: url('$(res)/img/cancel.svg');
-        position: relative;
-        top: 2px;
-        width: 12px;
+        mask-image: url('$(res)/img/element-icons/message/fwd.svg');
     }
 
     .mx_MessageContextMenu_iconRedact::before {
-        mask-image: url('$(res)/img/feather-customised/trash.custom.svg');
+        mask-image: url('$(res)/img/element-icons/trashcan.svg');
     }
 
     .mx_MessageContextMenu_iconResend::before {
@@ -79,7 +70,7 @@ limitations under the License.
     }
 
     .mx_MessageContextMenu_iconQuote::before {
-        mask-image: url('$(res)/img/format/quote.svg');
+        mask-image: url('$(res)/img/element-icons/room/format-bar/quote.svg');
     }
 
     .mx_MessageContextMenu_iconPin::before {
diff --git a/res/img/element-icons/message/fwd.svg b/res/img/element-icons/message/fwd.svg
new file mode 100644
index 0000000000..8bcc70d092
--- /dev/null
+++ b/res/img/element-icons/message/fwd.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="M10.9454 4.27941C10.653 3.98601 10.6539 3.51114 10.9472 3.21875C11.2406 2.92637 11.7155 2.92719 12.0079 3.22059L15.5312 6.75612C15.8229 7.0488 15.8229 7.52226 15.5312 7.81494L12.0079 11.3505C11.7155 11.6439 11.2407 11.6447 10.9473 11.3523C10.6539 11.06 10.653 10.5851 10.9454 10.2917L13.2292 8H6.36588C4.95064 8 3.75282 9.20272 3.75282 10.75C3.75282 12.2973 4.95064 13.5 6.36588 13.5H7.93524C8.34945 13.5 8.68524 13.8358 8.68524 14.25C8.68524 14.6642 8.34945 15 7.93524 15H6.36588C4.06634 15 2.25282 13.0687 2.25282 10.75C2.25282 8.43128 4.06634 6.5 6.36588 6.5H13.1583L10.9454 4.27941Z" fill="black"/>
+</svg>
diff --git a/res/img/element-icons/warning-badge.svg b/res/img/element-icons/warning-badge.svg
index 1ae4e40ffe..4e2ff75679 100644
--- a/res/img/element-icons/warning-badge.svg
+++ b/res/img/element-icons/warning-badge.svg
@@ -1,5 +1,4 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-    <circle cx="8" cy="8" r="8" fill="#FF4B55"/>
-    <rect x="7" y="3" width="2" height="6" rx="1" fill="white"/>
-    <rect x="7" y="11" width="2" height="2" rx="1" fill="white"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none">
+    <path style="fill:#ff4b55"
+          d="M8 0a8 8 0 0 0-8 8 8 8 0 0 0 8 8 8 8 0 0 0 8-8 8 8 0 0 0-8-8zm0 3c.554 0 1 .446 1 1v4c0 .554-.446 1-1 1s-1-.446-1-1V4c0-.554.446-1 1-1zm0 8c.554 0 1 .446 1 1s-.446 1-1 1-1-.446-1-1 .446-1 1-1z"/>
 </svg>