diff --git a/res/img/element-icons/room/composer/bulleted_list.svg b/res/img/element-icons/room/composer/bulleted_list.svg
index 828bb8ab03..df07604567 100644
--- a/res/img/element-icons/room/composer/bulleted_list.svg
+++ b/res/img/element-icons/room/composer/bulleted_list.svg
@@ -1,3 +1,10 @@
-<svg width="13" height="10" viewBox="0 0 13 10" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M1.66666 4C1.11332 4 0.666656 4.44667 0.666656 5C0.666656 5.55333 1.11332 6 1.66666 6C2.21999 6 2.66666 5.55333 2.66666 5C2.66666 4.44667 2.21999 4 1.66666 4ZM1.66666 0C1.11332 0 0.666656 0.446667 0.666656 1C0.666656 1.55333 1.11332 2 1.66666 2C2.21999 2 2.66666 1.55333 2.66666 1C2.66666 0.446667 2.21999 0 1.66666 0ZM1.66666 8C1.11332 8 0.666656 8.45333 0.666656 9C0.666656 9.54667 1.11999 10 1.66666 10C2.21332 10 2.66666 9.54667 2.66666 9C2.66666 8.45333 2.21999 8 1.66666 8ZM4.33332 9.66667H12.3333C12.7 9.66667 13 9.36667 13 9C13 8.63333 12.7 8.33333 12.3333 8.33333H4.33332C3.96666 8.33333 3.66666 8.63333 3.66666 9C3.66666 9.36667 3.96666 9.66667 4.33332 9.66667ZM4.33332 5.66667H12.3333C12.7 5.66667 13 5.36667 13 5C13 4.63333 12.7 4.33333 12.3333 4.33333H4.33332C3.96666 4.33333 3.66666 4.63333 3.66666 5C3.66666 5.36667 3.96666 5.66667 4.33332 5.66667ZM3.66666 1C3.66666 1.36667 3.96666 1.66667 4.33332 1.66667H12.3333C12.7 1.66667 13 1.36667 13 1C13 0.633333 12.7 0.333333 12.3333 0.333333H4.33332C3.96666 0.333333 3.66666 0.633333 3.66666 1Z" fill="currentColor"/>
+<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
index dd0be2aefc..e2949ec8c7 100644
--- a/res/img/element-icons/room/composer/code_block.svg
+++ b/res/img/element-icons/room/composer/code_block.svg
@@ -1,3 +1,3 @@
-<svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M4.14288 6.99997L5.47622 5.66663C5.5905 5.55235 5.64765 5.41266 5.64765 5.24758C5.64765 5.0825 5.5905 4.94282 5.47622 4.82854C5.36193 4.71425 5.22225 4.65711 5.05717 4.65711C4.89209 4.65711 4.75241 4.71425 4.63812 4.82854L2.86669 6.59997C2.8032 6.66346 2.75876 6.72695 2.73336 6.79044C2.70796 6.85393 2.69526 6.92377 2.69526 6.99997C2.69526 7.07616 2.70796 7.146 2.73336 7.20949C2.75876 7.27298 2.8032 7.33647 2.86669 7.39996L4.65717 9.19044C4.77145 9.30473 4.91114 9.36187 5.07622 9.36187C5.2413 9.36187 5.38098 9.30473 5.49526 9.19044C5.60955 9.07616 5.66669 8.93647 5.66669 8.77139C5.66669 8.60631 5.60955 8.46663 5.49526 8.35235L4.14288 6.99997ZM9.85717 6.99997L8.50479 8.35235C8.3905 8.46663 8.33336 8.60631 8.33336 8.77139C8.33336 8.93647 8.3905 9.07616 8.50479 9.19044C8.61907 9.30473 8.75876 9.36187 8.92384 9.36187C9.08891 9.36187 9.2286 9.30473 9.34288 9.19044L11.1334 7.39996C11.1969 7.33647 11.2413 7.27298 11.2667 7.20949C11.2921 7.146 11.3048 7.07616 11.3048 6.99997C11.3048 6.92377 11.2921 6.85393 11.2667 6.79044C11.2413 6.72695 11.1969 6.66346 11.1334 6.59997L9.34288 4.80949C9.29209 4.746 9.2286 4.70155 9.15241 4.67616C9.07622 4.65076 9.00003 4.63806 8.92384 4.63806C8.84765 4.63806 8.77463 4.65076 8.70479 4.67616C8.63495 4.70155 8.56828 4.746 8.50479 4.80949C8.3905 4.92377 8.33336 5.06346 8.33336 5.22854C8.33336 5.39362 8.3905 5.5333 8.50479 5.64758L9.85717 6.99997ZM1.28574 13.8571C0.980979 13.8571 0.714312 13.7428 0.48574 13.5143C0.257169 13.2857 0.142883 13.019 0.142883 12.7143V1.28568C0.142883 0.980918 0.257169 0.714251 0.48574 0.485679C0.714312 0.257108 0.980979 0.142822 1.28574 0.142822H12.7143C13.0191 0.142822 13.2857 0.257108 13.5143 0.485679C13.7429 0.714251 13.8572 0.980918 13.8572 1.28568V12.7143C13.8572 13.019 13.7429 13.2857 13.5143 13.5143C13.2857 13.7428 13.0191 13.8571 12.7143 13.8571H1.28574ZM1.28574 12.7143H12.7143V1.28568H1.28574V12.7143Z" fill="currentColor"/>
+<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/numbered_list.svg b/res/img/element-icons/room/composer/numbered_list.svg
index 46a5438f3f..5748c97766 100644
--- a/res/img/element-icons/room/composer/numbered_list.svg
+++ b/res/img/element-icons/room/composer/numbered_list.svg
@@ -1,3 +1,10 @@
-<svg width="13" height="12" viewBox="0 0 13 12" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M4.33334 2.66663H12.3333C12.7 2.66663 13 2.36663 13 1.99996C13 1.63329 12.7 1.33329 12.3333 1.33329H4.33334C3.96668 1.33329 3.66668 1.63329 3.66668 1.99996C3.66668 2.36663 3.96668 2.66663 4.33334 2.66663ZM12.3333 9.33329H4.33334C3.96668 9.33329 3.66668 9.63329 3.66668 9.99996C3.66668 10.3666 3.96668 10.6666 4.33334 10.6666H12.3333C12.7 10.6666 13 10.3666 13 9.99996C13 9.63329 12.7 9.33329 12.3333 9.33329ZM12.3333 5.33329H4.33334C3.96668 5.33329 3.66668 5.63329 3.66668 5.99996C3.66668 6.36663 3.96668 6.66663 4.33334 6.66663H12.3333C12.7 6.66663 13 6.36663 13 5.99996C13 5.63329 12.7 5.33329 12.3333 5.33329ZM2.00001 8.66663H0.666677C0.48001 8.66663 0.333344 8.81329 0.333344 8.99996C0.333344 9.18663 0.48001 9.33329 0.666677 9.33329H1.66668V9.66663H1.33334C1.14668 9.66663 1.00001 9.81329 1.00001 9.99996C1.00001 10.1866 1.14668 10.3333 1.33334 10.3333H1.66668V10.6666H0.666677C0.48001 10.6666 0.333344 10.8133 0.333344 11C0.333344 11.1866 0.48001 11.3333 0.666677 11.3333H2.00001C2.18668 11.3333 2.33334 11.1866 2.33334 11V8.99996C2.33334 8.81329 2.18668 8.66663 2.00001 8.66663ZM0.666677 1.33329H1.00001V2.99996C1.00001 3.18663 1.14668 3.33329 1.33334 3.33329C1.52001 3.33329 1.66668 3.18663 1.66668 2.99996V0.999959C1.66668 0.813293 1.52001 0.666626 1.33334 0.666626H0.666677C0.48001 0.666626 0.333344 0.813293 0.333344 0.999959C0.333344 1.18663 0.48001 1.33329 0.666677 1.33329ZM2.00001 4.66663H0.666677C0.48001 4.66663 0.333344 4.81329 0.333344 4.99996C0.333344 5.18663 0.48001 5.33329 0.666677 5.33329H1.53334L0.413343 6.63996C0.36001 6.69996 0.333344 6.77996 0.333344 6.85329V6.99996C0.333344 7.18663 0.48001 7.33329 0.666677 7.33329H2.00001C2.18668 7.33329 2.33334 7.18663 2.33334 6.99996C2.33334 6.81329 2.18668 6.66663 2.00001 6.66663H1.13334L2.25334 5.35996C2.30668 5.29996 2.33334 5.21996 2.33334 5.14663V4.99996C2.33334 4.81329 2.18668 4.66663 2.00001 4.66663Z" fill="currentColor"/>
+<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
index 82cc2d2875..e83480a6ee 100644
--- a/res/img/element-icons/room/composer/quote.svg
+++ b/res/img/element-icons/room/composer/quote.svg
@@ -1,6 +1,6 @@
-<svg width="14" height="12" viewBox="0 0 14 12" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M2.1458 0.893371C2.20888 0.465499 1.90205 0.0690897 1.46046 0.00796516C1.01887 -0.0531594 0.609758 0.244148 0.546674 0.67202L0.00822047 4.32413C-0.0548633 4.752 0.251974 5.14841 0.69356 5.20954C1.13515 5.27066 1.54426 4.97336 1.60735 4.54548L2.1458 0.893371Z" fill="currentColor"/>
-<path d="M10.2226 7.67587C10.2857 7.248 9.97885 6.85159 9.53726 6.79046C9.09568 6.72934 8.68656 7.02664 8.62348 7.45452L8.08502 11.1066C8.02194 11.5345 8.32878 11.9309 8.77036 11.992C9.21195 12.0532 9.62107 11.7559 9.68415 11.328L10.2226 7.67587Z" fill="currentColor"/>
-<path d="M5.21224 0.00574343C5.65509 0.0575575 5.97074 0.447414 5.91727 0.876513L5.90255 0.993287C5.89309 1.06788 5.87936 1.17541 5.86224 1.30757C5.828 1.57178 5.78013 1.93492 5.72561 2.33035C5.6179 3.11153 5.48009 4.04989 5.36895 4.58829C5.28147 5.01211 4.85597 5.28697 4.41856 5.20221C3.98115 5.11744 3.69748 4.70515 3.78496 4.28133C3.88411 3.80099 4.01552 2.91329 4.12447 2.12309C4.17828 1.73284 4.22559 1.37397 4.25946 1.11259C4.27639 0.981947 4.28994 0.875787 4.29925 0.802389L4.31351 0.689266C4.36698 0.260167 4.76938 -0.0460706 5.21224 0.00574343Z" fill="currentColor"/>
-<path d="M13.9918 7.67587C14.0549 7.248 13.748 6.85159 13.3064 6.79046C12.8649 6.72934 12.4557 7.02664 12.3927 7.45452L11.8542 11.1066C11.7911 11.5345 12.098 11.9309 12.5395 11.992C12.9811 12.0532 13.3902 11.7559 13.4533 11.328L13.9918 7.67587Z" fill="currentColor"/>
+<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>