diff --git a/res/css/structures/_GroupView.scss b/res/css/structures/_GroupView.scss
index ed0cf121a4..f05bb12017 100644
--- a/res/css/structures/_GroupView.scss
+++ b/res/css/structures/_GroupView.scss
@@ -63,11 +63,11 @@ limitations under the License.
 }
 
 .mx_GroupHeader_editButton::before {
-    mask-image: url('$(res)/img/feather-customised/settings.svg');
+    mask-image: url('$(res)/img/element-icons/settings.svg');
 }
 
 .mx_GroupHeader_shareButton::before {
-    mask-image: url('$(res)/img/icons-share.svg');
+    mask-image: url('$(res)/img/element-icons/room/share.svg');
 }
 
 .mx_GroupView_hostingSignup img {
diff --git a/res/css/structures/_RightPanel.scss b/res/css/structures/_RightPanel.scss
index da9303d8aa..e43ca44476 100644
--- a/res/css/structures/_RightPanel.scss
+++ b/res/css/structures/_RightPanel.scss
@@ -82,12 +82,12 @@ limitations under the License.
 }
 
 .mx_RightPanel_groupMembersButton::before {
-    mask-image: url('$(res)/img/icons-people.svg');
+    mask-image: url('$(res)/img/element-icons/community-members.svg');
     mask-position: center;
 }
 
 .mx_RightPanel_roomsButton::before {
-    mask-image: url('$(res)/img/icons-room-nobg.svg');
+    mask-image: url('$(res)/img/element-icons/community-rooms.svg');
     mask-position: center;
 }
 
diff --git a/res/css/structures/_UserMenu.scss b/res/css/structures/_UserMenu.scss
index e6a8e8ed9a..83bc4abd8a 100644
--- a/res/css/structures/_UserMenu.scss
+++ b/res/css/structures/_UserMenu.scss
@@ -32,7 +32,7 @@ limitations under the License.
             mask-size: contain;
             mask-repeat: no-repeat;
             background: $primary-fg-color;
-            mask-image: url('$(res)/img/feather-customised/more-horizontal.svg');
+            mask-image: url('$(res)/img/element-icons/context-menu.svg');
         }
     }
 
@@ -167,7 +167,7 @@ limitations under the License.
     }
 
     .mx_UserMenu_iconHome::before {
-        mask-image: url('$(res)/img/feather-customised/home.svg');
+        mask-image: url('$(res)/img/element-icons/roomlist/home.svg');
     }
 
     .mx_UserMenu_iconBell::before {
diff --git a/res/css/views/messages/_MessageActionBar.scss b/res/css/views/messages/_MessageActionBar.scss
index 9f3971ecf0..e3ccd99611 100644
--- a/res/css/views/messages/_MessageActionBar.scss
+++ b/res/css/views/messages/_MessageActionBar.scss
@@ -91,17 +91,17 @@ limitations under the License.
 }
 
 .mx_MessageActionBar_reactButton::after {
-    mask-image: url('$(res)/img/react.svg');
+    mask-image: url('$(res)/img/element-icons/room/message-bar/emoji.svg');
 }
 
 .mx_MessageActionBar_replyButton::after {
-    mask-image: url('$(res)/img/reply.svg');
+    mask-image: url('$(res)/img/element-icons/room/message-bar/reply.svg');
 }
 
 .mx_MessageActionBar_editButton::after {
-    mask-image: url('$(res)/img/edit.svg');
+    mask-image: url('$(res)/img/element-icons/room/message-bar/edit.svg');
 }
 
 .mx_MessageActionBar_optionsButton::after {
-    mask-image: url('$(res)/img/icon_context.svg');
+    mask-image: url('$(res)/img/element-icons/context-menu.svg');
 }
diff --git a/res/css/views/rooms/_MessageComposerFormatBar.scss b/res/css/views/rooms/_MessageComposerFormatBar.scss
index 27ee7b9795..d97c49630a 100644
--- a/res/css/views/rooms/_MessageComposerFormatBar.scss
+++ b/res/css/views/rooms/_MessageComposerFormatBar.scss
@@ -75,23 +75,23 @@ limitations under the License.
     }
 
     .mx_MessageComposerFormatBar_buttonIconBold::after {
-        mask-image: url('$(res)/img/format/bold.svg');
+        mask-image: url('$(res)/img/element-icons/room/format-bar/bold.svg');
     }
 
     .mx_MessageComposerFormatBar_buttonIconItalic::after {
-        mask-image: url('$(res)/img/format/italics.svg');
+        mask-image: url('$(res)/img/element-icons/room/format-bar/italic.svg');
     }
 
     .mx_MessageComposerFormatBar_buttonIconStrikethrough::after {
-        mask-image: url('$(res)/img/format/strikethrough.svg');
+        mask-image: url('$(res)/img/element-icons/room/format-bar/strikethrough.svg');
     }
 
     .mx_MessageComposerFormatBar_buttonIconQuote::after {
-        mask-image: url('$(res)/img/format/quote.svg');
+        mask-image: url('$(res)/img/element-icons/room/format-bar/quote.svg');
     }
 
     .mx_MessageComposerFormatBar_buttonIconCode::after {
-        mask-image: url('$(res)/img/format/code.svg');
+        mask-image: url('$(res)/img/element-icons/room/format-bar/code.svg');
     }
 }
 
diff --git a/res/css/views/rooms/_RoomSublist2.scss b/res/css/views/rooms/_RoomSublist2.scss
index 2ec959d472..3fb4d2aecb 100644
--- a/res/css/views/rooms/_RoomSublist2.scss
+++ b/res/css/views/rooms/_RoomSublist2.scss
@@ -147,7 +147,7 @@ limitations under the License.
         }
 
         .mx_RoomSublist2_menuButton::before {
-            mask-image: url('$(res)/img/feather-customised/more-horizontal.svg');
+            mask-image: url('$(res)/img/element-icons/context-menu.svg');
         }
 
         .mx_RoomSublist2_headerText {
diff --git a/res/css/views/rooms/_RoomTile2.scss b/res/css/views/rooms/_RoomTile2.scss
index 7475b27d5f..c355427f3a 100644
--- a/res/css/views/rooms/_RoomTile2.scss
+++ b/res/css/views/rooms/_RoomTile2.scss
@@ -132,7 +132,7 @@ limitations under the License.
     }
 
     .mx_RoomTile2_menuButton::before {
-        mask-image: url('$(res)/img/feather-customised/more-horizontal.svg');
+        mask-image: url('$(res)/img/element-icons/context-menu.svg');
     }
 
     &:not(.mx_RoomTile2_minimized) {
@@ -178,7 +178,7 @@ limitations under the License.
     mask-image: url('$(res)/img/element-icons/roomlist/notifications-dm.svg');
 }
 .mx_RoomTile2_iconCheck::before {
-    mask-image: url('$(res)/img/feather-customised/check.svg');
+    mask-image: url('$(res)/img/element-icons/roomlist/checkmark.svg');
 }
 
 .mx_RoomTile2_contextMenu {
diff --git a/res/img/element-icons/community-members.svg b/res/img/element-icons/community-members.svg
new file mode 100644
index 0000000000..3131075c7b
--- /dev/null
+++ b/res/img/element-icons/community-members.svg
@@ -0,0 +1,8 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<mask id="path-1-inside-1" fill="white">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M20 10C20 15.5228 15.5228 20 10 20C4.47715 20 0 15.5228 0 10C0 4.47715 4.47715 0 10 0C15.5228 0 20 4.47715 20 10ZM14.3804 11.412C15.59 11.412 16.5705 10.3498 16.5705 9.03936C16.5705 7.72896 15.59 6.66667 14.3804 6.66667C13.1708 6.66667 12.1902 7.72896 12.1902 9.03936C12.1902 10.3498 13.1708 11.412 14.3804 11.412ZM10.8333 15.7461C10.8333 13.7941 9.46231 12.1623 7.63071 11.7611C7.31877 11.6991 6.99645 11.6667 6.66667 11.6667C4.66814 11.6667 2.94347 12.8594 2.14307 14.5833L5.83334 18.4483H10.8333L10.8333 15.7461ZM12.8333 18.4483H14.3804L18.0844 14.5833C17.3081 13.3356 15.9394 12.5071 14.3804 12.5071C13.5955 12.5071 12.8588 12.7171 12.2216 13.0849C12.6134 13.8884 12.8333 14.7913 12.8333 15.7461L12.8333 18.4483ZM9.16669 7.70833C9.16669 9.2041 8.0474 10.4167 6.66669 10.4167C5.28597 10.4167 4.16669 9.2041 4.16669 7.70833C4.16669 6.21256 5.28597 5 6.66669 5C8.0474 5 9.16669 6.21256 9.16669 7.70833Z"/>
+</mask>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M20 10C20 15.5228 15.5228 20 10 20C4.47715 20 0 15.5228 0 10C0 4.47715 4.47715 0 10 0C15.5228 0 20 4.47715 20 10ZM14.3804 11.412C15.59 11.412 16.5705 10.3498 16.5705 9.03936C16.5705 7.72896 15.59 6.66667 14.3804 6.66667C13.1708 6.66667 12.1902 7.72896 12.1902 9.03936C12.1902 10.3498 13.1708 11.412 14.3804 11.412ZM10.8333 15.7461C10.8333 13.7941 9.46231 12.1623 7.63071 11.7611C7.31877 11.6991 6.99645 11.6667 6.66667 11.6667C4.66814 11.6667 2.94347 12.8594 2.14307 14.5833L5.83334 18.4483H10.8333L10.8333 15.7461ZM12.8333 18.4483H14.3804L18.0844 14.5833C17.3081 13.3356 15.9394 12.5071 14.3804 12.5071C13.5955 12.5071 12.8588 12.7171 12.2216 13.0849C12.6134 13.8884 12.8333 14.7913 12.8333 15.7461L12.8333 18.4483ZM9.16669 7.70833C9.16669 9.2041 8.0474 10.4167 6.66669 10.4167C5.28597 10.4167 4.16669 9.2041 4.16669 7.70833C4.16669 6.21256 5.28597 5 6.66669 5C8.0474 5 9.16669 6.21256 9.16669 7.70833Z" fill="black"/>
+<path d="M7.63071 11.7611L7.9873 10.1331L7.97144 10.1296L7.95552 10.1264L7.63071 11.7611ZM10.8333 15.7461H9.16665V15.7461L10.8333 15.7461ZM2.14307 14.5833L0.631393 13.8815L0.152784 14.9123L0.937622 15.7343L2.14307 14.5833ZM5.83334 18.4483L4.62789 19.5993L5.1203 20.115H5.83334V18.4483ZM10.8333 18.4483V20.115H12.5L12.5 18.4483L10.8333 18.4483ZM14.3804 18.4483V20.115H15.0916L15.5837 19.6015L14.3804 18.4483ZM12.8333 18.4483L11.1667 18.4483L11.1667 20.115H12.8333V18.4483ZM18.0844 14.5833L19.2877 15.7365L20.1834 14.802L19.4996 13.7029L18.0844 14.5833ZM12.2216 13.0849L11.3884 11.6415L10.0423 12.4185L10.7236 13.8155L12.2216 13.0849ZM12.8333 15.7461H11.1667V15.7461L12.8333 15.7461ZM10 21.6667C16.4433 21.6667 21.6667 16.4433 21.6667 10H18.3333C18.3333 14.6024 14.6024 18.3333 10 18.3333V21.6667ZM-1.66667 10C-1.66667 16.4433 3.55668 21.6667 10 21.6667V18.3333C5.39763 18.3333 1.66667 14.6024 1.66667 10H-1.66667ZM10 -1.66667C3.55668 -1.66667 -1.66667 3.55668 -1.66667 10H1.66667C1.66667 5.39763 5.39763 1.66667 10 1.66667V-1.66667ZM21.6667 10C21.6667 3.55668 16.4433 -1.66667 10 -1.66667V1.66667C14.6024 1.66667 18.3333 5.39763 18.3333 10H21.6667ZM14.9039 9.03936C14.9039 9.5574 14.5464 9.74538 14.3804 9.74538V13.0787C16.6335 13.0787 18.2372 11.1421 18.2372 9.03936H14.9039ZM14.3804 8.33334C14.5464 8.33334 14.9039 8.52132 14.9039 9.03936H18.2372C18.2372 6.9366 16.6335 5.00001 14.3804 5.00001V8.33334ZM13.8569 9.03936C13.8569 8.52132 14.2143 8.33334 14.3804 8.33334V5.00001C12.1272 5.00001 10.5235 6.9366 10.5235 9.03936H13.8569ZM14.3804 9.74538C14.2143 9.74538 13.8569 9.5574 13.8569 9.03936H10.5235C10.5235 11.1421 12.1272 13.0787 14.3804 13.0787V9.74538ZM7.27412 13.3892C8.35701 13.6264 9.16665 14.5936 9.16665 15.7461H12.5C12.5 12.9945 10.5676 10.6982 7.9873 10.1331L7.27412 13.3892ZM6.66667 13.3333C6.88675 13.3333 7.10029 13.355 7.3059 13.3958L7.95552 10.1264C7.53724 10.0433 7.10614 10 6.66667 10V13.3333ZM3.65474 15.2852C4.19734 14.1166 5.3526 13.3333 6.66667 13.3333V10C3.98369 10 1.68961 11.6023 0.631393 13.8815L3.65474 15.2852ZM7.03878 17.2974L3.34851 13.4324L0.937622 15.7343L4.62789 19.5993L7.03878 17.2974ZM10.8333 16.7817H5.83334V20.115H10.8333V16.7817ZM9.16665 15.7461L9.16666 18.4483L12.5 18.4483L12.5 15.7461L9.16665 15.7461ZM14.3804 16.7817H12.8333V20.115H14.3804V16.7817ZM16.8811 13.4301L13.1771 17.2951L15.5837 19.6015L19.2877 15.7365L16.8811 13.4301ZM14.3804 14.1738C15.3311 14.1738 16.1797 14.6768 16.6693 15.4638L19.4996 13.7029C18.4366 11.9944 16.5477 10.8405 14.3804 10.8405V14.1738ZM13.0549 14.5284C13.4465 14.3023 13.8969 14.1738 14.3804 14.1738V10.8405C13.2941 10.8405 12.2711 11.132 11.3884 11.6415L13.0549 14.5284ZM14.5 15.7461C14.5 14.5328 14.2201 13.3806 13.7196 12.3544L10.7236 13.8155C11.0068 14.3963 11.1667 15.0498 11.1667 15.7461H14.5ZM14.5 18.4483L14.5 15.7461L11.1667 15.7461L11.1667 18.4483L14.5 18.4483ZM6.66669 12.0833C9.09097 12.0833 10.8334 9.99646 10.8334 7.70833H7.50002C7.50002 8.41175 7.00383 8.75 6.66669 8.75V12.0833ZM2.50002 7.70833C2.50002 9.99646 4.2424 12.0833 6.66669 12.0833V8.75C6.32955 8.75 5.83335 8.41175 5.83335 7.70833H2.50002ZM6.66669 3.33333C4.2424 3.33333 2.50002 5.42021 2.50002 7.70833H5.83335C5.83335 7.00492 6.32955 6.66667 6.66669 6.66667V3.33333ZM10.8334 7.70833C10.8334 5.42021 9.09097 3.33333 6.66669 3.33333V6.66667C7.00383 6.66667 7.50002 7.00492 7.50002 7.70833H10.8334Z" fill="black" mask="url(#path-1-inside-1)"/>
+<path d="M19 10C19 14.9706 14.9706 19 10 19C5.02944 19 1 14.9706 1 10C1 5.02944 5.02944 1 10 1C14.9706 1 19 5.02944 19 10Z" stroke="black" stroke-width="2"/>
+</svg>
diff --git a/res/img/element-icons/community-rooms.svg b/res/img/element-icons/community-rooms.svg
new file mode 100644
index 0000000000..c46cedc74f
--- /dev/null
+++ b/res/img/element-icons/community-rooms.svg
@@ -0,0 +1,3 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M20 10C20 15.5228 15.5228 20 10 20C4.47715 20 0 15.5228 0 10C0 4.47715 4.47715 0 10 0C15.5228 0 20 4.47715 20 10ZM8.52525 4.00581C9.07433 4.06524 9.47127 4.55853 9.41184 5.10761L9.22345 6.84821H11.3843L11.596 4.89239C11.6554 4.34332 12.1487 3.94638 12.6978 4.00581C13.2469 4.06524 13.6438 4.55853 13.5844 5.10761L13.396 6.84821H14.3C14.8523 6.84821 15.3 7.29592 15.3 7.84821C15.3 8.40049 14.8523 8.84821 14.3 8.84821H13.1795L12.9319 11.1362H14.3C14.8523 11.1362 15.3 11.5839 15.3 12.1362C15.3 12.6884 14.8523 13.1362 14.3 13.1362H12.7154L12.502 15.1076C12.4426 15.6567 11.9493 16.0536 11.4002 15.9942C10.8512 15.9348 10.4542 15.4415 10.5136 14.8924L10.7037 13.1362H8.54287L8.32949 15.1076C8.27006 15.6567 7.77677 16.0536 7.22769 15.9942C6.67861 15.9348 6.28167 15.4415 6.3411 14.8924L6.53119 13.1362H5.5C4.94772 13.1362 4.5 12.6884 4.5 12.1362C4.5 11.5839 4.94772 11.1362 5.5 11.1362H6.74766L6.9953 8.84821H5.93922C5.38693 8.84821 4.93922 8.40049 4.93922 7.84821C4.93922 7.29592 5.38693 6.84821 5.93922 6.84821H7.21177L7.42345 4.89239C7.48288 4.34332 7.97618 3.94638 8.52525 4.00581ZM8.75934 11.1362H10.9202L11.1678 8.84821H9.00698L8.75934 11.1362Z" fill="black"/>
+</svg>
diff --git a/res/img/element-icons/room/message-bar/more.svg b/res/img/element-icons/context-menu.svg
similarity index 100%
rename from res/img/element-icons/room/message-bar/more.svg
rename to res/img/element-icons/context-menu.svg
diff --git a/res/img/element-icons/room/format-bar/quote.svg b/res/img/element-icons/room/format-bar/quote.svg
index 38f94457e8..3d3d444487 100644
--- a/res/img/element-icons/room/format-bar/quote.svg
+++ b/res/img/element-icons/room/format-bar/quote.svg
@@ -1,5 +1,6 @@
-<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 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/message-bar/reply.svg b/res/img/element-icons/room/message-bar/reply.svg
index 697f656b8a..9900d4d19d 100644
--- a/res/img/element-icons/room/message-bar/reply.svg
+++ b/res/img/element-icons/room/message-bar/reply.svg
@@ -1,5 +1,4 @@
 <svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
-<ellipse cx="5" cy="5.75" rx="1.5" ry="1.75" fill="black"/>
-<ellipse cx="13" cy="5.75" rx="1.5" ry="1.75" fill="black"/>
-<path d="M4.66558 10.6543C4.47466 10.2867 4.0219 10.1435 3.65431 10.3344C3.28672 10.5253 3.1435 10.9781 3.33442 11.3457L4.66558 10.6543ZM14.678 11.3206C14.8551 10.9462 14.6951 10.4991 14.3206 10.322C13.9462 10.1449 13.4991 10.3049 13.322 10.6794L14.678 11.3206ZM4 11C3.33442 11.3457 3.33458 11.346 3.33475 11.3463C3.33481 11.3464 3.33499 11.3468 3.33512 11.347C3.33537 11.3475 3.33565 11.3481 3.33596 11.3486C3.33657 11.3498 3.33729 11.3512 3.3381 11.3527C3.33972 11.3558 3.34175 11.3596 3.34417 11.3641C3.34901 11.3731 3.35546 11.3849 3.36353 11.3993C3.37966 11.4282 3.40229 11.4677 3.43154 11.5162C3.48998 11.6131 3.57517 11.7467 3.68808 11.9048C3.91323 12.2199 4.25254 12.6377 4.71468 13.056C5.64215 13.8956 7.08135 14.75 9.06977 14.75V13.25C7.54656 13.25 6.45087 12.6044 5.72136 11.944C5.35502 11.6123 5.08532 11.2801 4.90858 11.0327C4.82054 10.9095 4.75657 10.8088 4.71608 10.7416C4.69586 10.7081 4.68159 10.6831 4.67318 10.668C4.66898 10.6605 4.66625 10.6555 4.66499 10.6531C4.66435 10.652 4.66409 10.6515 4.66419 10.6516C4.66424 10.6517 4.66438 10.652 4.66461 10.6524C4.66473 10.6527 4.66487 10.6529 4.66503 10.6532C4.66511 10.6534 4.66525 10.6537 4.66529 10.6537C4.66543 10.654 4.66558 10.6543 4 11ZM9.06977 14.75C11.0611 14.75 12.4696 13.893 13.3669 13.0451C13.8129 12.6236 14.1351 12.2027 14.3471 11.8853C14.4535 11.7261 14.5331 11.5914 14.5875 11.4936C14.6148 11.4446 14.6358 11.4047 14.6508 11.3754C14.6583 11.3608 14.6643 11.3488 14.6688 11.3396C14.6711 11.335 14.673 11.3311 14.6745 11.3279C14.6753 11.3263 14.676 11.3249 14.6765 11.3237C14.6768 11.3231 14.6771 11.3225 14.6774 11.322C14.6775 11.3218 14.6776 11.3214 14.6777 11.3213C14.6779 11.3209 14.678 11.3206 14 11C13.322 10.6794 13.3221 10.6791 13.3223 10.6788C13.3223 10.6787 13.3224 10.6784 13.3225 10.6783C13.3227 10.6779 13.3228 10.6776 13.3229 10.6774C13.3232 10.6769 13.3233 10.6766 13.3234 10.6764C13.3235 10.6762 13.3233 10.6766 13.3228 10.6776C13.3217 10.6798 13.3193 10.6846 13.3156 10.6919C13.3081 10.7066 13.2952 10.7312 13.2768 10.7642C13.24 10.8304 13.1813 10.9301 13.0998 11.0522C12.9361 11.2973 12.6842 11.6264 12.3366 11.9549C11.6466 12.607 10.5901 13.25 9.06977 13.25V14.75Z" fill="black"/>
+<path d="M10.0663 14.25H11.636C13.4938 14.25 14.9998 12.683 14.9998 10.75C14.9998 8.817 13.4938 7.25 11.636 7.25H4.53369" stroke="black" stroke-width="1.5" stroke-linecap="round"/>
+<path d="M6.52417 3.75L3.00006 7.28553L6.52417 10.8211" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/res/img/element-icons/roomlist/checkmark.svg b/res/img/element-icons/roomlist/checkmark.svg
new file mode 100644
index 0000000000..3be39fc9b2
--- /dev/null
+++ b/res/img/element-icons/roomlist/checkmark.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 d="M4 8.81818L7.125 12L14 5" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/res/img/element-icons/roomlist/home.svg b/res/img/element-icons/roomlist/home.svg
new file mode 100644
index 0000000000..9598ccf184
--- /dev/null
+++ b/res/img/element-icons/roomlist/home.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 d="M2.33325 14.9494V7.28325C2.33325 6.8921 2.50502 6.52067 2.80305 6.26733L8.02845 1.82575C8.58859 1.34963 9.41125 1.34963 9.97139 1.82575L15.1968 6.26734C15.4948 6.52067 15.6666 6.89065 15.6666 7.28181V14.9756C15.6666 16.0899 14.7594 16.9891 13.6451 16.9792C11.3216 16.9585 7.43591 16.9341 4.38177 16.9659C3.25769 16.9776 2.33325 16.0735 2.33325 14.9494Z" fill="black"/>
+</svg>
diff --git a/res/img/element-icons/view-community.svg b/res/img/element-icons/view-community.svg
new file mode 100644
index 0000000000..ee33aa525e
--- /dev/null
+++ b/res/img/element-icons/view-community.svg
@@ -0,0 +1,8 @@
+<svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
+<mask id="path-1-inside-1" fill="white">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M9 17C13.4183 17 17 13.4183 17 9C17 4.58172 13.4183 1 9 1C4.58172 1 1 4.58172 1 9C1 13.4183 4.58172 17 9 17ZM8.3335 7.16667C8.3335 8.36328 7.43807 9.33333 6.3335 9.33333C5.22893 9.33333 4.3335 8.36328 4.3335 7.16667C4.3335 5.97005 5.22893 5 6.3335 5C7.43807 5 8.3335 5.97005 8.3335 7.16667ZM12.5043 10.1297C13.472 10.1297 14.2565 9.27984 14.2565 8.23152C14.2565 7.1832 13.472 6.33337 12.5043 6.33337C11.5367 6.33337 10.7522 7.1832 10.7522 8.23152C10.7522 9.27984 11.5367 10.1297 12.5043 10.1297ZM7.10447 10.4089C8.56975 10.7299 9.66656 12.0353 9.66656 13.5969L9.66656 15.7587H5.66657L2.71436 12.6667C3.35468 11.2876 4.73442 10.3334 6.33324 10.3334C6.59706 10.3334 6.85492 10.3594 7.10447 10.4089ZM11.1665 15.7586H12.5044L15.4676 12.6666C14.8466 11.6684 13.7516 11.0057 12.5044 11.0057C11.8406 11.0057 11.22 11.1934 10.6909 11.5195C10.9956 12.1471 11.1665 12.8519 11.1665 13.5969L11.1665 15.7586Z"/>
+</mask>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M9 17C13.4183 17 17 13.4183 17 9C17 4.58172 13.4183 1 9 1C4.58172 1 1 4.58172 1 9C1 13.4183 4.58172 17 9 17ZM8.3335 7.16667C8.3335 8.36328 7.43807 9.33333 6.3335 9.33333C5.22893 9.33333 4.3335 8.36328 4.3335 7.16667C4.3335 5.97005 5.22893 5 6.3335 5C7.43807 5 8.3335 5.97005 8.3335 7.16667ZM12.5043 10.1297C13.472 10.1297 14.2565 9.27984 14.2565 8.23152C14.2565 7.1832 13.472 6.33337 12.5043 6.33337C11.5367 6.33337 10.7522 7.1832 10.7522 8.23152C10.7522 9.27984 11.5367 10.1297 12.5043 10.1297ZM7.10447 10.4089C8.56975 10.7299 9.66656 12.0353 9.66656 13.5969L9.66656 15.7587H5.66657L2.71436 12.6667C3.35468 11.2876 4.73442 10.3334 6.33324 10.3334C6.59706 10.3334 6.85492 10.3594 7.10447 10.4089ZM11.1665 15.7586H12.5044L15.4676 12.6666C14.8466 11.6684 13.7516 11.0057 12.5044 11.0057C11.8406 11.0057 11.22 11.1934 10.6909 11.5195C10.9956 12.1471 11.1665 12.8519 11.1665 13.5969L11.1665 15.7586Z" fill="black"/>
+<path d="M9.66656 13.5969H8.33322V13.5969L9.66656 13.5969ZM7.10447 10.4089L7.38974 9.10648L7.37705 9.1037L7.36431 9.10117L7.10447 10.4089ZM9.66656 15.7587V17.092H10.9999L10.9999 15.7587L9.66656 15.7587ZM5.66657 15.7587L4.70222 16.6795L5.09614 17.092H5.66657V15.7587ZM2.71436 12.6667L1.50502 12.1052L1.12213 12.9299L1.75 13.5875L2.71436 12.6667ZM12.5044 15.7586V17.092H13.0733L13.467 16.6812L12.5044 15.7586ZM11.1665 15.7586L9.83313 15.7586L9.83313 17.092H11.1665V15.7586ZM15.4676 12.6666L16.4303 13.5892L17.1468 12.8416L16.5997 11.9623L15.4676 12.6666ZM10.6909 11.5195L9.99128 10.3845L8.96494 11.0171L9.49143 12.1018L10.6909 11.5195ZM11.1665 13.5969H9.83312V13.5969L11.1665 13.5969ZM15.6667 9C15.6667 12.6819 12.6819 15.6667 9 15.6667V18.3333C14.1547 18.3333 18.3333 14.1547 18.3333 9H15.6667ZM9 2.33333C12.6819 2.33333 15.6667 5.3181 15.6667 9H18.3333C18.3333 3.84534 14.1547 -0.333333 9 -0.333333V2.33333ZM2.33333 9C2.33333 5.3181 5.3181 2.33333 9 2.33333V-0.333333C3.84534 -0.333333 -0.333333 3.84534 -0.333333 9H2.33333ZM9 15.6667C5.3181 15.6667 2.33333 12.6819 2.33333 9H-0.333333C-0.333333 14.1547 3.84534 18.3333 9 18.3333V15.6667ZM6.3335 10.6667C8.27292 10.6667 9.66683 8.99717 9.66683 7.16667H7.00016C7.00016 7.7294 6.60321 8 6.3335 8V10.6667ZM3.00016 7.16667C3.00016 8.99717 4.39407 10.6667 6.3335 10.6667V8C6.06378 8 5.66683 7.7294 5.66683 7.16667H3.00016ZM6.3335 3.66667C4.39407 3.66667 3.00016 5.33616 3.00016 7.16667H5.66683C5.66683 6.60393 6.06378 6.33333 6.3335 6.33333V3.66667ZM9.66683 7.16667C9.66683 5.33616 8.27292 3.66667 6.3335 3.66667V6.33333C6.60321 6.33333 7.00016 6.60393 7.00016 7.16667H9.66683ZM12.9231 8.23152C12.9231 8.64596 12.6372 8.79634 12.5043 8.79634V11.463C14.3069 11.463 15.5898 9.91373 15.5898 8.23152H12.9231ZM12.5043 7.66671C12.6372 7.66671 12.9231 7.81709 12.9231 8.23152H15.5898C15.5898 6.54932 14.3069 5.00004 12.5043 5.00004V7.66671ZM12.0855 8.23152C12.0855 7.81709 12.3715 7.66671 12.5043 7.66671V5.00004C10.7018 5.00004 9.41886 6.54932 9.41886 8.23152H12.0855ZM12.5043 8.79634C12.3715 8.79634 12.0855 8.64596 12.0855 8.23152H9.41886C9.41886 9.91373 10.7018 11.463 12.5043 11.463V8.79634ZM10.9999 13.5969C10.9999 11.3957 9.45399 9.5586 7.38974 9.10648L6.8192 11.7114C7.68551 11.9011 8.33322 12.6749 8.33322 13.5969H10.9999ZM10.9999 15.7587L10.9999 13.5969L8.33322 13.5969L8.33323 15.7587L10.9999 15.7587ZM5.66657 17.092H9.66656V14.4254H5.66657V17.092ZM1.75 13.5875L4.70222 16.6795L6.63093 14.8379L3.67871 11.7459L1.75 13.5875ZM6.33324 9.00004C4.18685 9.00004 2.35159 10.2819 1.50502 12.1052L3.92369 13.2282C4.35777 12.2933 5.28198 11.6667 6.33324 11.6667V9.00004ZM7.36431 9.10117C7.0297 9.03469 6.68482 9.00004 6.33324 9.00004V11.6667C6.5093 11.6667 6.68013 11.684 6.84462 11.7167L7.36431 9.10117ZM12.5044 14.4253H11.1665V17.092H12.5044V14.4253ZM14.505 11.7441L11.5417 14.8361L13.467 16.6812L16.4303 13.5892L14.505 11.7441ZM12.5044 12.339C13.2649 12.339 13.9438 12.7414 14.3355 13.371L16.5997 11.9623C15.7493 10.5955 14.2382 9.67234 12.5044 9.67234V12.339ZM11.3906 12.6545C11.7163 12.4538 12.0958 12.339 12.5044 12.339V9.67234C11.5854 9.67234 10.7237 9.93304 9.99128 10.3845L11.3906 12.6545ZM12.4998 13.5969C12.4998 12.6459 12.2813 11.7425 11.8904 10.9373L9.49143 12.1018C9.70988 12.5518 9.83312 13.0578 9.83312 13.5969H12.4998ZM12.4998 15.7586L12.4998 13.5969L9.83312 13.5969L9.83313 15.7586L12.4998 15.7586Z" fill="black" mask="url(#path-1-inside-1)"/>
+<path d="M16.25 9C16.25 13.0041 13.0041 16.25 9 16.25C4.99594 16.25 1.75 13.0041 1.75 9C1.75 4.99594 4.99594 1.75 9 1.75C13.0041 1.75 16.25 4.99594 16.25 9Z" stroke="black" stroke-width="1.5"/>
+</svg>
diff --git a/src/components/views/context_menus/TagTileContextMenu.js b/src/components/views/context_menus/TagTileContextMenu.js
index ff1a7f1b14..e9ea008398 100644
--- a/src/components/views/context_menus/TagTileContextMenu.js
+++ b/src/components/views/context_menus/TagTileContextMenu.js
@@ -60,7 +60,7 @@ export default class TagTileContextMenu extends React.Component {
             <MenuItem className="mx_TagTileContextMenu_item" onClick={this._onViewCommunityClick}>
                 <TintableSvg
                     className="mx_TagTileContextMenu_item_icon"
-                    src={require("../../../../res/img/icons-groups.svg")}
+                    src={require("../../../../res/img/element-icons/view-community.svg")}
                     width="15"
                     height="15"
                 />