diff --git a/res/css/views/context_menus/_MessageContextMenu.pcss b/res/css/views/context_menus/_MessageContextMenu.pcss
index 823b96af2c..9002a3229c 100644
--- a/res/css/views/context_menus/_MessageContextMenu.pcss
+++ b/res/css/views/context_menus/_MessageContextMenu.pcss
@@ -65,11 +65,11 @@ Please see LICENSE files in the repository root for full details.
     }
 
     .mx_MessageContextMenu_iconSource::before {
-        mask-image: url("$(res)/img/element-icons/room/format-bar/code.svg");
+        mask-image: url("@vector-im/compound-design-tokens/icons/inline-code.svg");
     }
 
     .mx_MessageContextMenu_iconQuote::before {
-        mask-image: url("$(res)/img/element-icons/room/format-bar/quote.svg");
+        mask-image: url("@vector-im/compound-design-tokens/icons/quote.svg");
     }
 
     .mx_MessageContextMenu_iconPin::before {
diff --git a/res/css/views/rooms/_MessageComposer.pcss b/res/css/views/rooms/_MessageComposer.pcss
index c8f4105ed2..dde96afd6a 100644
--- a/res/css/views/rooms/_MessageComposer.pcss
+++ b/res/css/views/rooms/_MessageComposer.pcss
@@ -265,11 +265,11 @@ Please see LICENSE files in the repository root for full details.
 }
 
 .mx_MessageComposer_rich_text::before {
-    mask-image: url("$(res)/img/element-icons/room/composer/rich_text.svg");
+    mask-image: url("@vector-im/compound-design-tokens/icons/text-formatting.svg");
 }
 
 .mx_MessageComposer_location::before {
-    mask-image: url("$(res)/img/element-icons/room/composer/location.svg");
+    mask-image: url("@vector-im/compound-design-tokens/icons/location-pin-solid.svg");
 }
 
 .mx_MessageComposer_stickers::before {
diff --git a/res/css/views/rooms/_MessageComposerFormatBar.pcss b/res/css/views/rooms/_MessageComposerFormatBar.pcss
index cb412ff829..318bfe6547 100644
--- a/res/css/views/rooms/_MessageComposerFormatBar.pcss
+++ b/res/css/views/rooms/_MessageComposerFormatBar.pcss
@@ -63,27 +63,27 @@ Please see LICENSE files in the repository root for full details.
     }
 
     .mx_MessageComposerFormatBar_buttonIconBold::after {
-        mask-image: url("$(res)/img/element-icons/room/format-bar/bold.svg");
+        mask-image: url("@vector-im/compound-design-tokens/icons/bold.svg");
     }
 
     .mx_MessageComposerFormatBar_buttonIconItalic::after {
-        mask-image: url("$(res)/img/element-icons/room/format-bar/italic.svg");
+        mask-image: url("@vector-im/compound-design-tokens/icons/italic.svg");
     }
 
     .mx_MessageComposerFormatBar_buttonIconStrikethrough::after {
-        mask-image: url("$(res)/img/element-icons/room/format-bar/strikethrough.svg");
+        mask-image: url("@vector-im/compound-design-tokens/icons/strikethrough.svg");
     }
 
     .mx_MessageComposerFormatBar_buttonIconQuote::after {
-        mask-image: url("$(res)/img/element-icons/room/format-bar/quote.svg");
+        mask-image: url("@vector-im/compound-design-tokens/icons/quote.svg");
     }
 
     .mx_MessageComposerFormatBar_buttonIconCode::after {
-        mask-image: url("$(res)/img/element-icons/room/format-bar/code.svg");
+        mask-image: url("@vector-im/compound-design-tokens/icons/inline-code.svg");
     }
 
     .mx_MessageComposerFormatBar_buttonIconInsertLink::after {
-        mask-image: url("$(res)/img/element-icons/link.svg");
+        mask-image: url("@vector-im/compound-design-tokens/icons/link.svg");
         mask-size: 18px;
     }
 }
diff --git a/res/img/element-icons/room/composer/bold.svg b/res/img/element-icons/room/composer/bold.svg
deleted file mode 100644
index 043f9c064c..0000000000
--- a/res/img/element-icons/room/composer/bold.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M4 3C4 2.44772 4.44772 2 5 2H8.19231C10.093 2 11.5 3.64388 11.5 5.5C11.5 6.25349 11.2681 6.97201 10.8655 7.55977C11.8435 8.1788 12.5 9.25485 12.5 10.5C12.5 12.4594 10.8743 14 8.92857 14H5C4.44772 14 4 13.5523 4 13V3ZM6 4V7H8.19231C8.84067 7 9.5 6.4053 9.5 5.5C9.5 4.5947 8.84067 4 8.19231 4H6ZM6 9V12H8.92857C9.82319 12 10.5 11.3021 10.5 10.5C10.5 9.69794 9.82319 9 8.92857 9H6Z" fill="currentColor" />
-</svg>
diff --git a/res/img/element-icons/room/composer/bulleted_list.svg b/res/img/element-icons/room/composer/bulleted_list.svg
deleted file mode 100644
index df07604567..0000000000
--- a/res/img/element-icons/room/composer/bulleted_list.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_2793_14169)">
-<path d="M2.66669 7C2.11335 7 1.66669 7.44667 1.66669 8C1.66669 8.55333 2.11335 9 2.66669 9C3.22002 9 3.66669 8.55333 3.66669 8C3.66669 7.44667 3.22002 7 2.66669 7ZM2.66669 3C2.11335 3 1.66669 3.44667 1.66669 4C1.66669 4.55333 2.11335 5 2.66669 5C3.22002 5 3.66669 4.55333 3.66669 4C3.66669 3.44667 3.22002 3 2.66669 3ZM2.66669 11C2.11335 11 1.66669 11.4533 1.66669 12C1.66669 12.5467 2.12002 13 2.66669 13C3.21335 13 3.66669 12.5467 3.66669 12C3.66669 11.4533 3.22002 11 2.66669 11ZM5.33335 12.6667H13.3334C13.7 12.6667 14 12.3667 14 12C14 11.6333 13.7 11.3333 13.3334 11.3333H5.33335C4.96669 11.3333 4.66669 11.6333 4.66669 12C4.66669 12.3667 4.96669 12.6667 5.33335 12.6667ZM5.33335 8.66667H13.3334C13.7 8.66667 14 8.36667 14 8C14 7.63333 13.7 7.33333 13.3334 7.33333H5.33335C4.96669 7.33333 4.66669 7.63333 4.66669 8C4.66669 8.36667 4.96669 8.66667 5.33335 8.66667ZM4.66669 4C4.66669 4.36667 4.96669 4.66667 5.33335 4.66667H13.3334C13.7 4.66667 14 4.36667 14 4C14 3.63333 13.7 3.33333 13.3334 3.33333H5.33335C4.96669 3.33333 4.66669 3.63333 4.66669 4Z" fill="currentColor"/>
-</g>
-<defs>
-<clipPath id="clip0_2793_14169">
-<rect width="16" height="16" fill="white"/>
-</clipPath>
-</defs>
-</svg>
diff --git a/res/img/element-icons/room/composer/code_block.svg b/res/img/element-icons/room/composer/code_block.svg
deleted file mode 100644
index e2949ec8c7..0000000000
--- a/res/img/element-icons/room/composer/code_block.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M5.14288 7.99777L6.47622 6.66443C6.5905 6.55015 6.64765 6.41047 6.64765 6.24539C6.64765 6.08031 6.5905 5.94062 6.47622 5.82634C6.36193 5.71205 6.22225 5.65491 6.05717 5.65491C5.89209 5.65491 5.75241 5.71205 5.63812 5.82634L3.86669 7.59777C3.8032 7.66126 3.75876 7.72475 3.73336 7.78824C3.70796 7.85174 3.69526 7.92158 3.69526 7.99777C3.69526 8.07396 3.70796 8.1438 3.73336 8.20729C3.75876 8.27078 3.8032 8.33428 3.86669 8.39777L5.65717 10.1882C5.77145 10.3025 5.91114 10.3597 6.07622 10.3597C6.2413 10.3597 6.38098 10.3025 6.49526 10.1882C6.60955 10.074 6.66669 9.93428 6.66669 9.7692C6.66669 9.60412 6.60955 9.46443 6.49526 9.35015L5.14288 7.99777ZM10.8572 7.99777L9.50479 9.35015C9.3905 9.46443 9.33336 9.60412 9.33336 9.7692C9.33336 9.93428 9.3905 10.074 9.50479 10.1882C9.61907 10.3025 9.75876 10.3597 9.92384 10.3597C10.0889 10.3597 10.2286 10.3025 10.3429 10.1882L12.1334 8.39777C12.1969 8.33428 12.2413 8.27078 12.2667 8.20729C12.2921 8.1438 12.3048 8.07396 12.3048 7.99777C12.3048 7.92158 12.2921 7.85174 12.2667 7.78824C12.2413 7.72475 12.1969 7.66126 12.1334 7.59777L10.3429 5.80729C10.2921 5.7438 10.2286 5.69936 10.1524 5.67396C10.0762 5.64856 10 5.63586 9.92384 5.63586C9.84764 5.63586 9.77463 5.64856 9.70479 5.67396C9.63495 5.69936 9.56828 5.7438 9.50479 5.80729C9.3905 5.92158 9.33336 6.06126 9.33336 6.22634C9.33336 6.39142 9.3905 6.5311 9.50479 6.64539L10.8572 7.99777ZM2.28574 14.8549C1.98098 14.8549 1.71431 14.7406 1.48574 14.5121C1.25717 14.2835 1.14288 14.0168 1.14288 13.7121V2.28348C1.14288 1.97872 1.25717 1.71205 1.48574 1.48348C1.71431 1.25491 1.98098 1.14062 2.28574 1.14062H13.7143C14.0191 1.14062 14.2857 1.25491 14.5143 1.48348C14.7429 1.71205 14.8572 1.97872 14.8572 2.28348V13.7121C14.8572 14.0168 14.7429 14.2835 14.5143 14.5121C14.2857 14.7406 14.0191 14.8549 13.7143 14.8549H2.28574ZM2.28574 13.7121H13.7143V2.28348H2.28574V13.7121Z" fill="currentColor"/>
-</svg>
diff --git a/res/img/element-icons/room/composer/indent_decrease.svg b/res/img/element-icons/room/composer/indent_decrease.svg
deleted file mode 100644
index 660c3e55ca..0000000000
--- a/res/img/element-icons/room/composer/indent_decrease.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_2793_14104)">
-<path d="M8 11.3333H13.3333C13.7 11.3333 14 11.0333 14 10.6667C14 10.3 13.7 10 13.3333 10H8C7.63333 10 7.33333 10.3 7.33333 10.6667C7.33333 11.0333 7.63333 11.3333 8 11.3333ZM2.23333 8.23333L4.09333 10.0933C4.30667 10.3067 4.66667 10.16 4.66667 9.86V6.14C4.66667 5.84 4.30667 5.69333 4.1 5.90667L2.24 7.76667C2.10667 7.89333 2.10667 8.10667 2.23333 8.23333ZM2.66667 14H13.3333C13.7 14 14 13.7 14 13.3333C14 12.9667 13.7 12.6667 13.3333 12.6667H2.66667C2.3 12.6667 2 12.9667 2 13.3333C2 13.7 2.3 14 2.66667 14ZM2 2.66667C2 3.03333 2.3 3.33333 2.66667 3.33333H13.3333C13.7 3.33333 14 3.03333 14 2.66667C14 2.3 13.7 2 13.3333 2H2.66667C2.3 2 2 2.3 2 2.66667ZM8 6H13.3333C13.7 6 14 5.7 14 5.33333C14 4.96667 13.7 4.66667 13.3333 4.66667H8C7.63333 4.66667 7.33333 4.96667 7.33333 5.33333C7.33333 5.7 7.63333 6 8 6ZM8 8.66667H13.3333C13.7 8.66667 14 8.36667 14 8C14 7.63333 13.7 7.33333 13.3333 7.33333H8C7.63333 7.33333 7.33333 7.63333 7.33333 8C7.33333 8.36667 7.63333 8.66667 8 8.66667Z" fill="currentColor"/>
-</g>
-<defs>
-<clipPath id="clip0_2793_14104">
-<rect width="16" height="16" fill="white"/>
-</clipPath>
-</defs>
-</svg>
diff --git a/res/img/element-icons/room/composer/indent_increase.svg b/res/img/element-icons/room/composer/indent_increase.svg
deleted file mode 100644
index f40162e05d..0000000000
--- a/res/img/element-icons/room/composer/indent_increase.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_2793_4893)">
-<path d="M2.66667 14H13.3333C13.7 14 14 13.7 14 13.3333C14 12.9667 13.7 12.6667 13.3333 12.6667H2.66667C2.3 12.6667 2 12.9667 2 13.3333C2 13.7 2.3 14 2.66667 14ZM2 6.14V9.86667C2 10.1667 2.36 10.3133 2.56667 10.1L4.42667 8.24C4.56 8.10667 4.56 7.9 4.42667 7.76667L2.56667 5.9C2.36 5.69333 2 5.84 2 6.14ZM8 11.3333H13.3333C13.7 11.3333 14 11.0333 14 10.6667C14 10.3 13.7 10 13.3333 10H8C7.63333 10 7.33333 10.3 7.33333 10.6667C7.33333 11.0333 7.63333 11.3333 8 11.3333ZM2 2.66667C2 3.03333 2.3 3.33333 2.66667 3.33333H13.3333C13.7 3.33333 14 3.03333 14 2.66667C14 2.3 13.7 2 13.3333 2H2.66667C2.3 2 2 2.3 2 2.66667ZM8 6H13.3333C13.7 6 14 5.7 14 5.33333C14 4.96667 13.7 4.66667 13.3333 4.66667H8C7.63333 4.66667 7.33333 4.96667 7.33333 5.33333C7.33333 5.7 7.63333 6 8 6ZM8 8.66667H13.3333C13.7 8.66667 14 8.36667 14 8C14 7.63333 13.7 7.33333 13.3333 7.33333H8C7.63333 7.33333 7.33333 7.63333 7.33333 8C7.33333 8.36667 7.63333 8.66667 8 8.66667Z" fill="currentColor"/>
-</g>
-<defs>
-<clipPath id="clip0_2793_4893">
-<rect width="16" height="16" fill="white"/>
-</clipPath>
-</defs>
-</svg>
diff --git a/res/img/element-icons/room/composer/inline_code.svg b/res/img/element-icons/room/composer/inline_code.svg
deleted file mode 100644
index d9f75fde0c..0000000000
--- a/res/img/element-icons/room/composer/inline_code.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M9.97188 3.74903C10.0777 3.39637 9.87755 3.02471 9.52489 2.91892C9.17223 2.81312 8.80058 3.01324 8.69478 3.3659L6.02811 12.2548C5.92231 12.6075 6.12243 12.9791 6.4751 13.0849C6.82776 13.1907 7.19941 12.9906 7.30521 12.6379L9.97188 3.74903Z" fill="currentColor"/>
-<path d="M3.98237 4.82315C3.69951 4.58744 3.27914 4.62566 3.04343 4.90851L0.821206 7.57518C0.615181 7.82241 0.615181 8.18153 0.821206 8.42876L3.04343 11.0954C3.27914 11.3783 3.69951 11.4165 3.98237 11.1808C4.26522 10.9451 4.30343 10.5247 4.06772 10.2418L2.20116 8.00197L4.06772 5.76209C4.30343 5.47924 4.26522 5.05886 3.98237 4.82315Z" fill="currentColor"/>
-<path d="M12.0177 4.82315C12.3005 4.58744 12.7209 4.62566 12.9566 4.90851L15.1788 7.57518C15.3849 7.82241 15.3849 8.18153 15.1788 8.42876L12.9566 11.0954C12.7209 11.3783 12.3005 11.4165 12.0177 11.1808C11.7348 10.9451 11.6966 10.5247 11.9323 10.2418L13.7989 8.00197L11.9323 5.76209C11.6966 5.47924 11.7348 5.05886 12.0177 4.82315Z" fill="currentColor"/>
-</svg>
diff --git a/res/img/element-icons/room/composer/italic.svg b/res/img/element-icons/room/composer/italic.svg
deleted file mode 100644
index c6cd755d94..0000000000
--- a/res/img/element-icons/room/composer/italic.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M8.08596 3.60016L6.28068 12.4045H4.79997C4.35814 12.4045 3.99997 12.7627 3.99997 13.2045C3.99997 13.6464 4.35814 14.0045 4.79997 14.0045H6.92104C6.92979 14.0047 6.93852 14.0047 6.94722 14.0045H9.06664C9.50846 14.0045 9.86664 13.6464 9.86664 13.2045C9.86664 12.7627 9.50846 12.4045 9.06664 12.4045H7.91397L9.71924 3.60016H11.2C11.6418 3.60016 12 3.24199 12 2.80016C12 2.35833 11.6418 2.00016 11.2 2.00016H9.08168C9.07107 1.99995 9.06048 1.99995 9.04993 2.00016H6.9333C6.49147 2.00016 6.1333 2.35833 6.1333 2.80016C6.1333 3.24199 6.49147 3.60016 6.9333 3.60016H8.08596Z" fill="currentColor"/>
-</svg>
diff --git a/res/img/element-icons/room/composer/link.svg b/res/img/element-icons/room/composer/link.svg
deleted file mode 100644
index 8c7429e16a..0000000000
--- a/res/img/element-icons/room/composer/link.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M8.37751 4.10063L8.73382 3.74433C9.718 2.76019 11.3042 2.75074 12.2767 3.72324C13.2493 4.69573 13.2398 6.2819 12.2556 7.26605L10.5627 8.9589C9.57856 9.94304 7.99234 9.95249 7.01981 8.98M7.62266 11.8992L7.26619 12.2557C6.28201 13.2398 4.69578 13.2493 3.72325 12.2768C2.75073 11.3043 2.76018 9.7181 3.74436 8.73395L5.43717 7.0412C6.42134 6.05706 8.00756 6.04761 8.98009 7.0201" stroke="currentColor" stroke-width="1.5" stroke-linecap="round"/>
-</svg>
diff --git a/res/img/element-icons/room/composer/location.svg b/res/img/element-icons/room/composer/location.svg
deleted file mode 100644
index 7118645443..0000000000
--- a/res/img/element-icons/room/composer/location.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M12 2C8.13 2 5 5.13 5 9C5 13.17 9.42 18.92 11.24 21.11C11.64 21.59 12.37 21.59 12.77 21.11C14.58 18.92 19 13.17 19 9C19 5.13 15.87 2 12 2ZM12 11.5C10.62 11.5 9.5 10.38 9.5 9C9.5 7.62 10.62 6.5 12 6.5C13.38 6.5 14.5 7.62 14.5 9C14.5 10.38 13.38 11.5 12 11.5Z" fill="#0DBD8B"/>
-</svg>
diff --git a/res/img/element-icons/room/composer/numbered_list.svg b/res/img/element-icons/room/composer/numbered_list.svg
deleted file mode 100644
index 5748c97766..0000000000
--- a/res/img/element-icons/room/composer/numbered_list.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_2793_4634)">
-<path d="M5.33331 4.66406H13.3333C13.7 4.66406 14 4.36406 14 3.9974C14 3.63073 13.7 3.33073 13.3333 3.33073H5.33331C4.96665 3.33073 4.66665 3.63073 4.66665 3.9974C4.66665 4.36406 4.96665 4.66406 5.33331 4.66406ZM13.3333 11.3307H5.33331C4.96665 11.3307 4.66665 11.6307 4.66665 11.9974C4.66665 12.3641 4.96665 12.6641 5.33331 12.6641H13.3333C13.7 12.6641 14 12.3641 14 11.9974C14 11.6307 13.7 11.3307 13.3333 11.3307ZM13.3333 7.33073H5.33331C4.96665 7.33073 4.66665 7.63073 4.66665 7.9974C4.66665 8.36406 4.96665 8.66406 5.33331 8.66406H13.3333C13.7 8.66406 14 8.36406 14 7.9974C14 7.63073 13.7 7.33073 13.3333 7.33073ZM2.99998 10.6641H1.66665C1.47998 10.6641 1.33331 10.8107 1.33331 10.9974C1.33331 11.1841 1.47998 11.3307 1.66665 11.3307H2.66665V11.6641H2.33331C2.14665 11.6641 1.99998 11.8107 1.99998 11.9974C1.99998 12.1841 2.14665 12.3307 2.33331 12.3307H2.66665V12.6641H1.66665C1.47998 12.6641 1.33331 12.8107 1.33331 12.9974C1.33331 13.1841 1.47998 13.3307 1.66665 13.3307H2.99998C3.18665 13.3307 3.33331 13.1841 3.33331 12.9974V10.9974C3.33331 10.8107 3.18665 10.6641 2.99998 10.6641ZM1.66665 3.33073H1.99998V4.9974C1.99998 5.18406 2.14665 5.33073 2.33331 5.33073C2.51998 5.33073 2.66665 5.18406 2.66665 4.9974V2.9974C2.66665 2.81073 2.51998 2.66406 2.33331 2.66406H1.66665C1.47998 2.66406 1.33331 2.81073 1.33331 2.9974C1.33331 3.18406 1.47998 3.33073 1.66665 3.33073ZM2.99998 6.66406H1.66665C1.47998 6.66406 1.33331 6.81073 1.33331 6.9974C1.33331 7.18406 1.47998 7.33073 1.66665 7.33073H2.53331L1.41331 8.6374C1.35998 8.6974 1.33331 8.7774 1.33331 8.85073V8.9974C1.33331 9.18406 1.47998 9.33073 1.66665 9.33073H2.99998C3.18665 9.33073 3.33331 9.18406 3.33331 8.9974C3.33331 8.81073 3.18665 8.66406 2.99998 8.66406H2.13331L3.25331 7.3574C3.30665 7.2974 3.33331 7.2174 3.33331 7.14406V6.9974C3.33331 6.81073 3.18665 6.66406 2.99998 6.66406Z" fill="currentColor"/>
-</g>
-<defs>
-<clipPath id="clip0_2793_4634">
-<rect width="16" height="16" fill="white"/>
-</clipPath>
-</defs>
-</svg>
diff --git a/res/img/element-icons/room/composer/quote.svg b/res/img/element-icons/room/composer/quote.svg
deleted file mode 100644
index e83480a6ee..0000000000
--- a/res/img/element-icons/room/composer/quote.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M3.1458 2.89337C3.20888 2.4655 2.90205 2.06909 2.46046 2.00797C2.01887 1.94684 1.60976 2.24415 1.54667 2.67202L1.00822 6.32413C0.945137 6.752 1.25197 7.14841 1.69356 7.20954C2.13515 7.27066 2.54426 6.97336 2.60735 6.54548L3.1458 2.89337Z" fill="currentColor"/>
-<path d="M11.2226 9.67587C11.2857 9.248 10.9789 8.85159 10.5373 8.79046C10.0957 8.72934 9.68656 9.02664 9.62348 9.45452L9.08502 13.1066C9.02194 13.5345 9.32878 13.9309 9.77036 13.992C10.212 14.0532 10.6211 13.7559 10.6842 13.328L11.2226 9.67587Z" fill="currentColor"/>
-<path d="M6.21224 2.00574C6.65509 2.05756 6.97074 2.44741 6.91727 2.87651L6.90255 2.99329C6.89309 3.06788 6.87936 3.17541 6.86224 3.30757C6.828 3.57178 6.78013 3.93492 6.72561 4.33035C6.6179 5.11153 6.48009 6.04989 6.36895 6.58829C6.28147 7.01211 5.85597 7.28697 5.41856 7.20221C4.98115 7.11744 4.69748 6.70515 4.78496 6.28133C4.88411 5.80099 5.01552 4.91329 5.12447 4.12309C5.17828 3.73284 5.22559 3.37397 5.25946 3.11259C5.27639 2.98195 5.28994 2.87579 5.29925 2.80239L5.31351 2.68927C5.36698 2.26017 5.76938 1.95393 6.21224 2.00574Z" fill="currentColor"/>
-<path d="M14.9918 9.67587C15.0549 9.248 14.748 8.85159 14.3064 8.79046C13.8649 8.72934 13.4557 9.02664 13.3927 9.45452L12.8542 13.1066C12.7911 13.5345 13.098 13.9309 13.5395 13.992C13.9811 14.0532 14.3902 13.7559 14.4533 13.328L14.9918 9.67587Z" fill="currentColor"/>
-</svg>
diff --git a/res/img/element-icons/room/composer/rich_text.svg b/res/img/element-icons/room/composer/rich_text.svg
deleted file mode 100644
index d2da9d2551..0000000000
--- a/res/img/element-icons/room/composer/rich_text.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_1456_146350)">
-<path d="M1 18.6667C1 19.4 1.6 20 2.33333 20H18.3333C19.0667 20 19.6667 19.4 19.6667 18.6667C19.6667 17.9333 19.0667 17.3333 18.3333 17.3333H2.33333C1.6 17.3333 1 17.9333 1 18.6667ZM7 11.7333H13.6667L14.5467 13.8667C14.7467 14.3467 15.2133 14.6667 15.7333 14.6667C16.6533 14.6667 17.2667 13.72 16.9067 12.88L11.7333 0.92C11.4933 0.36 10.9467 0 10.3333 0C9.72 0 9.17333 0.36 8.93333 0.92L3.76 12.88C3.4 13.72 4.02667 14.6667 4.94667 14.6667C5.46667 14.6667 5.93333 14.3467 6.13333 13.8667L7 11.7333ZM10.3333 2.64L12.8267 9.33333H7.84L10.3333 2.64Z" fill="#C1C6CD"/>
-</g>
-<defs>
-<clipPath id="clip0_1456_146350">
-<rect width="20" height="20" fill="white"/>
-</clipPath>
-</defs>
-</svg>
diff --git a/res/img/element-icons/room/composer/strikethrough.svg b/res/img/element-icons/room/composer/strikethrough.svg
deleted file mode 100644
index 9a9761729b..0000000000
--- a/res/img/element-icons/room/composer/strikethrough.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M9.93167 4.76958C9.48979 3.88101 8.58375 3.47362 7.58232 3.58148C6.03349 3.74829 5.62648 4.94831 5.81497 5.72822C6.02118 6.58143 6.69765 6.91317 7.89252 7.21717H13.28C13.6776 7.21717 14 7.56757 14 7.99981C14 8.43204 13.6776 8.78244 13.28 8.78244H2.72C2.32235 8.78244 2 8.43204 2 7.99981C2 7.56757 2.32235 7.21717 2.72 7.21717H4.90308C4.69392 6.91824 4.52701 6.55948 4.42223 6.12592C4.0021 4.38757 5.03605 2.28279 7.44033 2.02384C8.85635 1.87133 10.4103 2.44045 11.1984 4.02524C11.3875 4.40548 11.2572 4.88035 10.9074 5.08589C10.5576 5.29143 10.1208 5.14981 9.93167 4.76958Z" fill="currentColor"/>
-<path d="M10.2846 10.0868H11.7797C11.9254 10.8705 11.8142 11.7067 11.3665 12.4212C10.7426 13.4169 9.57984 14 7.98987 14C5.38435 14 4.18628 12.3895 3.94151 11.324C3.84516 10.9047 4.07981 10.4798 4.4656 10.3751C4.8514 10.2704 5.24225 10.5254 5.3386 10.9448C5.41285 11.268 6.00136 12.4347 7.98987 12.4347C9.27118 12.4347 9.90296 11.9764 10.1763 11.5401C10.4284 11.1378 10.472 10.6062 10.2846 10.0868Z" fill="currentColor"/>
-</svg>
diff --git a/res/img/element-icons/room/composer/underline.svg b/res/img/element-icons/room/composer/underline.svg
deleted file mode 100644
index f253c874ea..0000000000
--- a/res/img/element-icons/room/composer/underline.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M8.19333 11.3C10.2133 11.04 11.6667 9.22667 11.6667 7.19333V2.83333C11.6667 2.37333 11.2933 2 10.8333 2C10.3733 2 10 2.37333 10 2.83333V7.26667C10 8.38 9.24667 9.39333 8.15333 9.61333C6.65333 9.92667 5.33333 8.78 5.33333 7.33333V2.83333C5.33333 2.37333 4.96 2 4.5 2C4.04 2 3.66667 2.37333 3.66667 2.83333V7.33333C3.66667 9.71333 5.75333 11.6133 8.19333 11.3ZM3 13.3333C3 13.7 3.3 14 3.66667 14H11.6667C12.0333 14 12.3333 13.7 12.3333 13.3333C12.3333 12.9667 12.0333 12.6667 11.6667 12.6667H3.66667C3.3 12.6667 3 12.9667 3 13.3333Z" fill="currentColor"/>
-</svg>
diff --git a/res/img/element-icons/room/format-bar/bold.svg b/res/img/element-icons/room/format-bar/bold.svg
deleted file mode 100644
index e21210c525..0000000000
--- a/res/img/element-icons/room/format-bar/bold.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M6.5 4H9.19231C10.4668 4 11.5 5.11929 11.5 6.5C11.5 7.88071 10.4668 9 9.19231 9H6.5" stroke="black" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M9.92857 9C11.3487 9 12.5 10.1193 12.5 11.5C12.5 12.8807 11.3487 14 9.92857 14H6.5" stroke="black" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M6 4V14" stroke="black" stroke-width="2" stroke-linecap="round"/>
-</svg>
diff --git a/res/img/element-icons/room/format-bar/code.svg b/res/img/element-icons/room/format-bar/code.svg
deleted file mode 100644
index 38f94457e8..0000000000
--- a/res/img/element-icons/room/format-bar/code.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg width="20" height="18" viewBox="0 0 20 18" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M5 6L2.5 9L5 12" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M15 6L17.5 9L15 12" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M8.5 14L11.5 4" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/res/img/element-icons/room/format-bar/italic.svg b/res/img/element-icons/room/format-bar/italic.svg
deleted file mode 100644
index 270c4f5f15..0000000000
--- a/res/img/element-icons/room/format-bar/italic.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M8 14L10 4" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M6 14H10" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M8 4H12" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/res/img/element-icons/room/format-bar/quote.svg b/res/img/element-icons/room/format-bar/quote.svg
deleted file mode 100644
index 3d3d444487..0000000000
--- a/res/img/element-icons/room/format-bar/quote.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M3.75 4L3.25 7.5" stroke="black" stroke-width="1.5" stroke-linecap="round"/>
-<path d="M11.25 10.5L10.75 14" stroke="black" stroke-width="1.5" stroke-linecap="round"/>
-<path d="M7.25 4C7.25 4 6.94526 6.52369 6.75 7.5" stroke="black" stroke-width="1.5" stroke-linecap="round"/>
-<path d="M14.75 10.5L14.25 14" stroke="black" stroke-width="1.5" stroke-linecap="round"/>
-</svg>
diff --git a/res/img/element-icons/room/format-bar/strikethrough.svg b/res/img/element-icons/room/format-bar/strikethrough.svg
deleted file mode 100644
index 775e0cf8ec..0000000000
--- a/res/img/element-icons/room/format-bar/strikethrough.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<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="M8.56492 4.7659C9.60808 4.66254 10.5519 5.05294 11.0122 5.90446C11.2091 6.26884 11.6642 6.40456 12.0286 6.20759C12.393 6.01062 12.5287 5.55555 12.3317 5.19116C11.5107 3.67245 9.89203 3.12706 8.41702 3.27321C5.91255 3.52137 4.83552 5.53838 5.27315 7.20425C5.50106 8.0718 6.01113 8.62683 6.61493 9H11.4496C11.299 8.9214 11.1451 8.85419 10.9923 8.7957C10.4784 8.59897 9.88735 8.4702 9.35846 8.35499L9.35839 8.35497C9.25076 8.33152 9.1457 8.30864 9.0444 8.28585C7.70219 7.98399 6.94756 7.6744 6.72393 6.82313C6.52759 6.07574 6.95155 4.92576 8.56492 4.7659ZM12.9372 11H11.3798C11.575 11.4977 11.5295 12.0072 11.267 12.3926C10.9822 12.8107 10.3242 13.25 8.98945 13.25C6.91808 13.25 6.30505 12.1319 6.22771 11.8222C6.12735 11.4203 5.72021 11.1759 5.31834 11.2763C4.91647 11.3766 4.67204 11.7838 4.7724 12.1856C5.02738 13.2066 6.27536 14.75 8.98945 14.75C10.6457 14.75 11.8569 14.1912 12.5068 13.237C12.9731 12.5523 13.0889 11.751 12.9372 11Z" fill="black"/>
-<path d="M3.5 9L14.5 9" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/src/components/views/elements/Pill.tsx b/src/components/views/elements/Pill.tsx
index ace96388a8..569dcdf313 100644
--- a/src/components/views/elements/Pill.tsx
+++ b/src/components/views/elements/Pill.tsx
@@ -10,6 +10,7 @@ import React, { ReactElement } from "react";
 import classNames from "classnames";
 import { Room, RoomMember } from "matrix-js-sdk/src/matrix";
 import { Tooltip } from "@vector-im/compound-web";
+import LinkIcon from "@vector-im/compound-design-tokens/assets/web/icons/link";
 
 import { MatrixClientPeg } from "../../../MatrixClientPeg";
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
@@ -17,7 +18,6 @@ import { usePermalink } from "../../../hooks/usePermalink";
 import RoomAvatar from "../avatars/RoomAvatar";
 import MemberAvatar from "../avatars/MemberAvatar";
 import { _t } from "../../../languageHandler";
-import { Icon as LinkIcon } from "../../../../res/img/element-icons/room/composer/link.svg";
 import { Icon as UserIcon } from "../../../../res/img/compound/user.svg";
 
 export enum PillType {
diff --git a/src/components/views/rooms/wysiwyg_composer/components/FormattingButtons.tsx b/src/components/views/rooms/wysiwyg_composer/components/FormattingButtons.tsx
index 85f1ad79bd..619037a89f 100644
--- a/src/components/views/rooms/wysiwyg_composer/components/FormattingButtons.tsx
+++ b/src/components/views/rooms/wysiwyg_composer/components/FormattingButtons.tsx
@@ -9,19 +9,19 @@ Please see LICENSE files in the repository root for full details.
 import React, { MouseEventHandler, ReactNode } from "react";
 import { FormattingFunctions, AllActionStates, ActionState } from "@matrix-org/matrix-wysiwyg";
 import classNames from "classnames";
+import BoldIcon from "@vector-im/compound-design-tokens/assets/web/icons/bold";
+import BulletedListIcon from "@vector-im/compound-design-tokens/assets/web/icons/list-bulleted";
+import CodeBlockIcon from "@vector-im/compound-design-tokens/assets/web/icons/code";
+import UnIndentIcon from "@vector-im/compound-design-tokens/assets/web/icons/indent-decrease";
+import IndentIcon from "@vector-im/compound-design-tokens/assets/web/icons/indent-increase";
+import InlineCodeIcon from "@vector-im/compound-design-tokens/assets/web/icons/inline-code";
+import ItalicIcon from "@vector-im/compound-design-tokens/assets/web/icons/italic";
+import NumberedListIcon from "@vector-im/compound-design-tokens/assets/web/icons/list-numbered";
+import QuoteIcon from "@vector-im/compound-design-tokens/assets/web/icons/quote";
+import StrikeThroughIcon from "@vector-im/compound-design-tokens/assets/web/icons/strikethrough";
+import UnderlineIcon from "@vector-im/compound-design-tokens/assets/web/icons/underline";
+import LinkIcon from "@vector-im/compound-design-tokens/assets/web/icons/link";
 
-import { Icon as BoldIcon } from "../../../../../../res/img/element-icons/room/composer/bold.svg";
-import { Icon as ItalicIcon } from "../../../../../../res/img/element-icons/room/composer/italic.svg";
-import { Icon as UnderlineIcon } from "../../../../../../res/img/element-icons/room/composer/underline.svg";
-import { Icon as StrikeThroughIcon } from "../../../../../../res/img/element-icons/room/composer/strikethrough.svg";
-import { Icon as QuoteIcon } from "../../../../../../res/img/element-icons/room/composer/quote.svg";
-import { Icon as InlineCodeIcon } from "../../../../../../res/img/element-icons/room/composer/inline_code.svg";
-import { Icon as LinkIcon } from "../../../../../../res/img/element-icons/room/composer/link.svg";
-import { Icon as BulletedListIcon } from "../../../../../../res/img/element-icons/room/composer/bulleted_list.svg";
-import { Icon as NumberedListIcon } from "../../../../../../res/img/element-icons/room/composer/numbered_list.svg";
-import { Icon as CodeBlockIcon } from "../../../../../../res/img/element-icons/room/composer/code_block.svg";
-import { Icon as IndentIcon } from "../../../../../../res/img/element-icons/room/composer/indent_increase.svg";
-import { Icon as UnIndentIcon } from "../../../../../../res/img/element-icons/room/composer/indent_decrease.svg";
 import { _t } from "../../../../../languageHandler";
 import AccessibleButton, { ButtonEvent } from "../../../elements/AccessibleButton";
 import { openLinkModal } from "./LinkModal";