diff --git a/res/themes/superhero/img/icons/community-room.svg b/res/themes/superhero/img/icons/community-room.svg
index 887fc83c37..3d5a10bbc0 100644
--- a/res/themes/superhero/img/icons/community-room.svg
+++ b/res/themes/superhero/img/icons/community-room.svg
@@ -1,6 +1,6 @@
 <svg viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <circle cx="12" cy="12" r="12" fill="white" />
     <path fill-rule="evenodd" clip-rule="evenodd"
-        d="M17.4315 15.2736L12.967 23C16.206 22.7194 19.0289 21.0519 20.8478 18.5867L18.0894 13.7901C17.9324 14.3145 17.711 14.8128 17.4315 15.2736ZM17.7045 9.21981L21.9841 16.6646C22.6366 15.2502 23 13.6705 23 12.0002C23 10.4218 22.6743 8.92408 22.0873 7.57043H16.5478C17.0144 8.05441 17.4067 8.61082 17.7045 9.21981ZM20.9919 5.61965L12.0575 5.60899C12.036 5.60873 12.0145 5.60899 11.993 5.60899C11.4759 5.60899 10.9707 5.67345 10.4869 5.79469L13.2314 1.02791C16.4435 1.38689 19.2267 3.11328 20.9919 5.61965ZM11.0115 1C7.77576 1.27888 4.9614 2.94336 3.14786 5.40537L5.8988 10.1959C6.05575 9.67211 6.27613 9.17356 6.55456 8.71357L11.0115 1ZM6.26108 14.7302L2.01051 7.33713C1.3612 8.7512 1 10.3305 1 12.0002C1 13.5737 1.32143 15.0666 1.90301 16.4169H7.43606C6.95983 15.9229 6.56101 15.3536 6.26108 14.7302ZM11.9285 18.3783L2.98984 18.3677C4.74747 20.8807 7.52529 22.6123 10.7406 22.9724L13.4959 18.1936C13.0132 18.3141 12.509 18.3783 11.993 18.3783C11.9715 18.3783 11.95 18.3786 11.9285 18.3783Z"
+        d="M12 24C18.6274 24 24 18.6274 24 12C24 5.37258 18.6274 0 12 0C5.37262 0 0 5.37258 0 12C0 18.6274 5.37262 24 12 24ZM14.9324 4.82915C14.5333 4.65738 14.0965 4.52818 13.6223 4.44158V2.43478H10.9521V4.38116C10.3274 4.46569 9.7517 4.62502 9.22452 4.85913C8.3998 5.21891 7.75102 5.7286 7.27887 6.38819C6.80639 7.04112 6.57031 7.80732 6.57031 8.68678V8.69677C6.57031 9.78277 6.92935 10.6656 7.64776 11.3451C8.36651 12.0247 9.4341 12.5078 10.8512 12.7943L12.3679 13.0941C13.266 13.2806 13.9046 13.5138 14.284 13.7936C14.6698 14.0668 14.8624 14.4466 14.8624 14.9329V14.9429C14.8624 15.3094 14.7497 15.6325 14.5234 15.9123C14.3037 16.1855 13.9912 16.3987 13.5853 16.5519C13.1861 16.6985 12.7072 16.7718 12.1484 16.7718C11.6029 16.7718 11.1138 16.6985 10.6814 16.5519C10.249 16.3987 9.8964 16.1888 9.62364 15.9223C9.35768 15.6492 9.19124 15.326 9.12466 14.9529L9.10496 14.843H6.26087L6.27072 15.0029C6.33084 15.889 6.6036 16.6485 7.08899 17.2815C7.57473 17.9078 8.24015 18.3908 9.08492 18.7306C9.64538 18.9499 10.268 19.097 10.9521 19.1719V21.1531H13.6223V19.1151C14.1929 19.0242 14.713 18.8794 15.1821 18.6806C16.0533 18.3075 16.7188 17.7845 17.1777 17.1116C17.6433 16.432 17.876 15.6292 17.876 14.7031V14.6931C17.876 13.9402 17.7198 13.2973 17.4073 12.7643C17.1012 12.2246 16.6257 11.7782 15.9803 11.4251C15.3349 11.072 14.5099 10.7955 13.5054 10.5956L11.9786 10.2858C11.1539 10.1192 10.5486 9.89604 10.1627 9.61621C9.77683 9.33638 9.5839 8.96994 9.5839 8.51688V8.50689C9.5839 8.16043 9.68037 7.85728 9.8733 7.59744C10.0727 7.3376 10.3587 7.1344 10.7313 6.98782C11.1039 6.83459 11.5462 6.75796 12.0584 6.75796C12.5574 6.75796 12.9966 6.83126 13.3757 6.97783C13.7615 7.12441 14.071 7.33428 14.3037 7.60744C14.5367 7.87395 14.6797 8.19707 14.733 8.57684L14.7429 8.69677H17.587L17.5768 8.50689C17.5302 7.66741 17.2809 6.93119 16.8285 6.29824C16.376 5.6653 15.7439 5.17561 14.9324 4.82915Z"
         fill="#1161FE" />
-    <circle cx="12.0077" cy="12.0081" r="4.40322" fill="#1161FE" />
 </svg>
diff --git a/res/themes/superhero/img/icons/tokengated-room.svg b/res/themes/superhero/img/icons/tokengated-room.svg
index 2108131a86..0359af6128 100644
--- a/res/themes/superhero/img/icons/tokengated-room.svg
+++ b/res/themes/superhero/img/icons/tokengated-room.svg
@@ -1,6 +1,6 @@
 <svg viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
     <path fill-rule="evenodd" clip-rule="evenodd"
-        d="M11.24 1L2 5.02865V11.1152C2 16.7229 5.93847 21.9738 11.24 23.2744V17.4477C8.74755 16.9666 6.86506 14.7733 6.86506 12.1404C6.86506 9.50743 8.74755 7.31415 11.24 6.83307V1ZM12.86 17.514C15.568 17.2203 17.6759 14.9265 17.6759 12.1404C17.6759 9.35426 15.568 7.06046 12.86 6.76675V1L22.1 5.02865V11.1152C22.1 16.7229 18.1615 21.9738 12.86 23.2744V17.514Z"
+        d="M10.7459 0L0.790039 4.34075V10.8988C0.790039 16.941 5.03362 22.5986 10.7459 24V17.6846C8.13423 17.1112 6.17969 14.7838 6.17969 12C6.17969 9.21615 8.13423 6.88881 10.7459 6.31539V0ZM13.2539 17.6845C15.8654 17.1109 17.8197 14.7837 17.8197 12C17.8197 9.2163 15.8654 6.88906 13.2539 6.31549L13.2539 0L23.2098 4.34075V10.8988C23.2098 16.941 18.9662 22.5986 13.2539 24L13.2539 17.6845Z"
         fill="#1161FE" />
-    <circle cx="12.3004" cy="12.16" r="3.94" fill="#1161FE" />
+    <circle cx="12" cy="12" r="3.5" fill="#1161FE" />
 </svg>
diff --git a/src/components/views/rooms/RoomTile.tsx b/src/components/views/rooms/RoomTile.tsx
index 6747a13ddc..b2cc0f0bfc 100644
--- a/src/components/views/rooms/RoomTile.tsx
+++ b/src/components/views/rooms/RoomTile.tsx
@@ -479,11 +479,12 @@ export class RoomTile extends React.PureComponent<ClassProps, State> {
         return (
             <React.Fragment>
                 <RovingTabIndexWrapper inputRef={this.roomTileRef}>
-                    {({ onFocus, isActive }): ReactElement<any, any> => (
+                    {({ onFocus, isActive, ref }): ReactElement<any, any> => (
                         <Button
                             {...props}
                             onFocus={onFocus}
                             tabIndex={isActive ? 0 : -1}
+                            ref={ref}
                             className={classes}
                             onClick={this.onTileClick}
                             onContextMenu={this.onContextMenu}