diff --git a/src/app/molecules/room-search/RoomSearch.jsx b/src/app/molecules/room-search/RoomSearch.jsx
index 64356f0..f6bdf24 100644
--- a/src/app/molecules/room-search/RoomSearch.jsx
+++ b/src/app/molecules/room-search/RoomSearch.jsx
@@ -164,7 +164,7 @@ function RoomSearch({ roomId }) {
 
         {!isRoomEncrypted && searchData?.results.length === 0 && (
           <div className="room-search__help">
-            <Text>No result found</Text>
+            <Text>No results found</Text>
           </div>
         )}
         {isRoomEncrypted && (
diff --git a/src/app/molecules/space-add-existing/SpaceAddExisting.jsx b/src/app/molecules/space-add-existing/SpaceAddExisting.jsx
index 58604c7..f7a3120 100644
--- a/src/app/molecules/space-add-existing/SpaceAddExisting.jsx
+++ b/src/app/molecules/space-add-existing/SpaceAddExisting.jsx
@@ -124,7 +124,7 @@ function SpaceAddExistingContent({ roomId }) {
         />
         <IconButton size="small" type="button" onClick={handleSearchClear} src={CrossIC} />
       </form>
-      {searchIds?.length === 0 && <Text>No result found</Text>}
+      {searchIds?.length === 0 && <Text>No results found</Text>}
       {
         (searchIds || allRoomIds).map((rId) => {
           const room = mx.getRoom(rId);
diff --git a/src/app/organisms/room/PeopleDrawer.jsx b/src/app/organisms/room/PeopleDrawer.jsx
index ee96614..f00ff89 100644
--- a/src/app/organisms/room/PeopleDrawer.jsx
+++ b/src/app/organisms/room/PeopleDrawer.jsx
@@ -195,7 +195,7 @@ function PeopleDrawer({ roomId }) {
                 (searchedMembers?.data.length === 0 || memberList.length === 0)
                 && (
                   <div className="people-drawer__noresult">
-                    <Text variant="b2">No result found!</Text>
+                    <Text variant="b2">No results found!</Text>
                   </div>
                 )
               }
diff --git a/src/app/organisms/room/common.jsx b/src/app/organisms/room/common.jsx
index 2120e78..12b9f2b 100644
--- a/src/app/organisms/room/common.jsx
+++ b/src/app/organisms/room/common.jsx
@@ -87,7 +87,7 @@ function getTimelineJSXMessages() {
       return (
         <>
           <b>{twemojify(user)}</b>
-          {' set the avatar'}
+          {' set a avatar'}
         </>
       );
     },
@@ -95,7 +95,7 @@ function getTimelineJSXMessages() {
       return (
         <>
           <b>{twemojify(user)}</b>
-          {' changed the avatar'}
+          {' changed their avatar'}
         </>
       );
     },
@@ -103,7 +103,7 @@ function getTimelineJSXMessages() {
       return (
         <>
           <b>{twemojify(user)}</b>
-          {' removed the avatar'}
+          {' removed their avatar'}
         </>
       );
     },
@@ -111,7 +111,7 @@ function getTimelineJSXMessages() {
       return (
         <>
           <b>{twemojify(user)}</b>
-          {' set the display name to '}
+          {' set display name to '}
           <b>{twemojify(newName)}</b>
         </>
       );
@@ -120,7 +120,7 @@ function getTimelineJSXMessages() {
       return (
         <>
           <b>{twemojify(user)}</b>
-          {' changed the display name to '}
+          {' changed their display name to '}
           <b>{twemojify(newName)}</b>
         </>
       );
@@ -129,7 +129,7 @@ function getTimelineJSXMessages() {
       return (
         <>
           <b>{twemojify(user)}</b>
-          {' removed the display name '}
+          {' removed their display name '}
           <b>{twemojify(lastName)}</b>
         </>
       );