diff --git a/component/api/src/main/java/org/exoplatform/social/core/space/SpaceListAccess.java b/component/api/src/main/java/org/exoplatform/social/core/space/SpaceListAccess.java
index 64846232db5..45fca4f1dda 100644
--- a/component/api/src/main/java/org/exoplatform/social/core/space/SpaceListAccess.java
+++ b/component/api/src/main/java/org/exoplatform/social/core/space/SpaceListAccess.java
@@ -18,7 +18,6 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.stream.Collectors;
 
 import org.apache.commons.lang3.StringUtils;
 import org.exoplatform.commons.utils.ListAccess;
@@ -261,7 +260,7 @@ public Space[] load(int offset, int limit) throws Exception, IllegalArgumentExce
         break;
       case PUBLIC_FILTER: listSpaces = spaceStorage.getPublicSpacesByFilter(this.userId, this.spaceFilter, offset, limit);
         break;
-      case PUBLIC_SUPER_USER: listSpaces = new ArrayList<Space> ();
+      case PUBLIC_SUPER_USER: listSpaces = new ArrayList<> ();
         break;
       case SETTING: listSpaces = spaceStorage.getEditableSpaces(this.userId, offset, limit);
         break;
diff --git a/component/core/src/main/java/org/exoplatform/social/core/identity/ProfileFilterListAccess.java b/component/core/src/main/java/org/exoplatform/social/core/identity/ProfileFilterListAccess.java
index f651de4b95f..6143f496e0c 100644
--- a/component/core/src/main/java/org/exoplatform/social/core/identity/ProfileFilterListAccess.java
+++ b/component/core/src/main/java/org/exoplatform/social/core/identity/ProfileFilterListAccess.java
@@ -173,7 +173,8 @@ public Identity[] load(int offset, int limit) throws Exception, IllegalArgumentE
       Iterator<? extends Identity> iterator = identities.iterator();
       while (iterator.hasNext()) {
         Identity identity = iterator.next();
-        if (identity.equals(profileFilter.getViewerIdentity())) {
+        if (identity == null || (profileFilter.getViewerIdentity() != null
+                                 && identity.getId().equals(profileFilter.getViewerIdentity().getId()))) {
           iterator.remove();
         }
       }
diff --git a/component/core/src/main/java/org/exoplatform/social/core/space/SpaceUtils.java b/component/core/src/main/java/org/exoplatform/social/core/space/SpaceUtils.java
index 63e3d4a587f..45be03aa665 100644
--- a/component/core/src/main/java/org/exoplatform/social/core/space/SpaceUtils.java
+++ b/component/core/src/main/java/org/exoplatform/social/core/space/SpaceUtils.java
@@ -17,11 +17,8 @@
 package org.exoplatform.social.core.space;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.Comparator;
-import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;
@@ -441,6 +438,9 @@ public static void removePagesAndGroupNavigation(Space space) throws Exception {
    */
 
   public static void changeAppPageTitle(UserNode spacePageNode, String newSpaceName) throws Exception {
+    if (spacePageNode == null || spacePageNode.getPageRef() == null) {
+      return;
+    }
     LayoutService layoutService = getLayoutService();
     Page page = layoutService.getPage(spacePageNode.getPageRef().format());
 
diff --git a/component/service/src/main/java/io/meeds/social/link/rest/LinkRest.java b/component/service/src/main/java/io/meeds/social/link/rest/LinkRest.java
index e90c6ddc675..23ae75f6ba7 100644
--- a/component/service/src/main/java/io/meeds/social/link/rest/LinkRest.java
+++ b/component/service/src/main/java/io/meeds/social/link/rest/LinkRest.java
@@ -49,7 +49,7 @@
 import io.meeds.social.link.model.Link;
 import io.meeds.social.link.model.LinkSetting;
 import io.meeds.social.link.rest.model.LinkSettingRestEntity;
-import io.meeds.social.link.rest.util.EntityBuilder;
+import io.meeds.social.link.rest.util.LinkEntityBuilder;
 import io.meeds.social.link.service.LinkService;
 
 import io.swagger.v3.oas.annotations.Operation;
@@ -130,8 +130,8 @@ public Response getLinkSetting(
       @ApiResponse(responseCode = "401", description = "Unauthorized"), })
   public Response saveLinkSetting(LinkSettingRestEntity linkSettingEntity) {
     try {
-      LinkSetting linkSetting = EntityBuilder.toLinkSetting(linkSettingEntity);
-      List<Link> linksToSave = EntityBuilder.toLinks(linkSettingEntity);
+      LinkSetting linkSetting = LinkEntityBuilder.toLinkSetting(linkSettingEntity);
+      List<Link> linksToSave = LinkEntityBuilder.toLinks(linkSettingEntity);
       linkSetting = linkService.saveLinkSetting(linkSetting, linksToSave, RestUtils.getCurrentUserAclIdentity());
       return Response.ok(getLinkSettingEntity(linkSetting, null)).build();
     } catch (IllegalAccessException e) {
@@ -190,7 +190,7 @@ public Response getLinkIcon(
 
   private LinkSettingRestEntity getLinkSettingEntity(LinkSetting linkSetting, String lang) {
     List<Link> links = linkService.getLinks(linkSetting.getName(), lang, true);
-    return EntityBuilder.build(linkSetting, links);
+    return LinkEntityBuilder.build(linkSetting, links);
   }
 
 }
diff --git a/component/service/src/main/java/io/meeds/social/link/rest/util/EntityBuilder.java b/component/service/src/main/java/io/meeds/social/link/rest/util/LinkEntityBuilder.java
similarity index 98%
rename from component/service/src/main/java/io/meeds/social/link/rest/util/EntityBuilder.java
rename to component/service/src/main/java/io/meeds/social/link/rest/util/LinkEntityBuilder.java
index a66d3262092..430945eaf0b 100644
--- a/component/service/src/main/java/io/meeds/social/link/rest/util/EntityBuilder.java
+++ b/component/service/src/main/java/io/meeds/social/link/rest/util/LinkEntityBuilder.java
@@ -34,9 +34,9 @@
 import io.meeds.social.link.rest.model.LinkRestEntity;
 import io.meeds.social.link.rest.model.LinkSettingRestEntity;
 
-public class EntityBuilder {
+public class LinkEntityBuilder {
 
-  private EntityBuilder() {
+  private LinkEntityBuilder() {
     // Utils class
   }
 
diff --git a/component/service/src/main/java/org/exoplatform/social/rest/api/EntityBuilder.java b/component/service/src/main/java/org/exoplatform/social/rest/api/EntityBuilder.java
index 7d25c7e4c72..a3329092f4b 100644
--- a/component/service/src/main/java/org/exoplatform/social/rest/api/EntityBuilder.java
+++ b/component/service/src/main/java/org/exoplatform/social/rest/api/EntityBuilder.java
@@ -453,7 +453,7 @@ public static ProfileEntity buildEntityProfile(Profile profile, String restPath,
       }
     }
     if (expandAttributes.contains(SETTINGS)) {
-      userEntity.setProperties(EntityBuilder.buildProperties(profile, canViewProperties));
+      userEntity.setProperties(buildProperties(profile, canViewProperties));
     }
     if (expandAttributes.contains(MANAGER) && profile.getProperty(MANAGER) != null) {
       buildListManagers(userEntity, profile, restPath);
@@ -538,8 +538,8 @@ private static void buildManagedUsersCount(ProfileEntity userEntity) {
     }
   }
 
+  @SuppressWarnings("unchecked")
   private static void buildListManagers(ProfileEntity userEntity, Profile profile, String restPath) {
-    @SuppressWarnings("unchecked")
     ArrayList<Map<String, String>> userNames = new ArrayList<>();
     if (profile.getProperty(MANAGER) instanceof List<?>) {
       userNames = (ArrayList<Map<String, String>>) profile.getProperty(MANAGER);
@@ -783,6 +783,31 @@ public static List<DataEntity> buildEntityProfiles(String[] userNames, String re
     return userEntities;
   }
 
+  public static CollectionEntity buildEntityFromSpaces(List<Space> spaces,
+                                                       String username,
+                                                       int offset,
+                                                       int limit,
+                                                       String expand,
+                                                       UriInfo uriInfo) {
+    List<DataEntity> spaceInfos = new ArrayList<>();
+    for (Space space : spaces) {
+      SpaceEntity spaceInfo = buildEntityFromSpace(space, username, uriInfo.getPath(), expand);
+      spaceInfos.add(spaceInfo.getDataEntity());
+    }
+    CollectionEntity collectionSpace = new CollectionEntity(spaceInfos, SPACES_TYPE, offset, limit);
+    if (StringUtils.isNotBlank(expand) && Arrays.asList(StringUtils.split(expand, ",")).contains(RestProperties.UNREAD)) {
+      SpaceWebNotificationService spaceWebNotificationService = ExoContainerContext.getService(SpaceWebNotificationService.class);
+      Map<Long, Long> unreadItemsPerSpace = spaceWebNotificationService.countUnreadItemsBySpace(username);
+      if (MapUtils.isNotEmpty(unreadItemsPerSpace)) {
+        collectionSpace.setUnreadPerSpace(unreadItemsPerSpace.entrySet()
+                                                             .stream()
+                                                             .collect(Collectors.toMap(e -> e.getKey().toString(),
+                                                                                       Entry::getValue)));
+      }
+    }
+    return collectionSpace;
+  }
+
   /**
    * Get a hash map from a space in order to build a json object for the rest
    * service
@@ -800,7 +825,7 @@ public static SpaceEntity buildEntityFromSpace(Space space, String userId, Strin
     if (StringUtils.isNotBlank(userId)) {
       IdentityManager identityManager = getIdentityManager();
       GroupSpaceBindingService groupSpaceBindingService = CommonsUtils.getService(GroupSpaceBindingService.class);
-      if (ArrayUtils.contains(space.getMembers(), userId) || spaceService.isSuperManager(userId)) {
+      if (spaceService.canViewSpace(space, userId)) {
         spaceEntity.setHref(RestUtils.getRestUrl(SPACES_TYPE, space.getId(), restPath));
         Identity spaceIdentity = identityManager.getOrCreateIdentity(SpaceIdentityProvider.NAME, space.getPrettyName());
 
@@ -879,18 +904,6 @@ public static SpaceEntity buildEntityFromSpace(Space space, String userId, Strin
           spaceEntity.setIsFavorite(String.valueOf(isFavorite));
         }
 
-        if (expandFields.contains(RestProperties.UNREAD)) {
-          Identity userIdentity = identityManager.getOrCreateUserIdentity(userId);
-          SpaceWebNotificationService spaceWebNotificationService =
-                                                                  ExoContainerContext.getService(SpaceWebNotificationService.class);
-          Map<String, Long> unreadItems =
-                                        spaceWebNotificationService.countUnreadItemsByApplication(Long.parseLong(userIdentity.getId()),
-                                                                                                  Long.parseLong(space.getId()));
-          if (MapUtils.isNotEmpty(unreadItems)) {
-            spaceEntity.setUnreadItems(unreadItems);
-          }
-        }
-
         if (expandFields.contains(RestProperties.MUTED)) {
           UserSettingService userSettingService = ExoContainerContext.getService(UserSettingService.class);
           UserSetting userSetting = userSettingService.get(userId);
@@ -910,6 +923,7 @@ public static SpaceEntity buildEntityFromSpace(Space space, String userId, Strin
       spaceEntity.setIsInvited(spaceService.isInvitedUser(space, userId));
       spaceEntity.setIsMember(spaceService.isMember(space, userId));
       spaceEntity.setCanEdit(canEdit);
+      spaceEntity.setCanRedactOnSpace(spaceService.canRedactOnSpace(space, getCurrentUserIdentity()));
       spaceEntity.setIsManager(isManager);
       spaceEntity.setIsRedactor(spaceService.isRedactor(space, userId));
       spaceEntity.setIsPublisher(spaceService.isPublisher(space, userId));
@@ -918,7 +932,7 @@ public static SpaceEntity buildEntityFromSpace(Space space, String userId, Strin
       spaceEntity.setIsMember(spaceService.isMember(space, currentUserIdentity.getRemoteId()));
     }
 
-    PortalConfig portalConfig = getLayoutService().getPortalConfig(new SiteKey(GROUP, space.getGroupId()));
+    PortalConfig portalConfig = getLayoutService().getPortalConfig(new SiteKey(PortalConfig.GROUP_TYPE, space.getGroupId()));
     spaceEntity.setSiteId((portalConfig.getStorageId().split("_"))[1]);
 
     spaceEntity.setDisplayName(space.getDisplayName());
@@ -932,8 +946,19 @@ public static SpaceEntity buildEntityFromSpace(Space space, String userId, Strin
     spaceEntity.setAvatarUrl(space.getAvatarUrl());
     spaceEntity.setBannerUrl(space.getBannerUrl());
     spaceEntity.setVisibility(space.getVisibility());
-    spaceEntity.setPublicSiteId(space.getPublicSiteId());
-    spaceEntity.setPublicSiteVisibility(space.getPublicSiteVisibility());
+    if (space.getPublicSiteId() > 0) {
+      PortalConfig publicPortalConfig = getLayoutService().getPortalConfig(space.getPublicSiteId());
+      if (publicPortalConfig == null
+          || !getUserACL().hasAccessPermission(publicPortalConfig, getCurrentUserIdentity())) {
+        spaceEntity.setPublicSiteId(0l);
+      } else {
+        spaceEntity.setPublicSiteId(space.getPublicSiteId());
+        spaceEntity.setPublicSiteVisibility(space.getPublicSiteVisibility());
+        spaceEntity.setPublicSiteName(publicPortalConfig.getName());
+      }
+    } else {
+      spaceEntity.setPublicSiteId(0l);
+    }
     spaceEntity.setSubscription(space.getRegistration());
     spaceEntity.setMembersCount(space.getMembers() == null ? 0 : countUsers(space.getMembers()));
     spaceEntity.setManagersCount(space.getManagers() == null ? 0 : countUsers(space.getManagers()));
@@ -1003,11 +1028,11 @@ private static DataEntity buildSpaceMembership(SpaceService spaceService,
                                                  String restPath,
                                                  String expand) {
     if (getMembershipTypePredicate(spaceService, membershipType).test(space, userId)) {
-      return EntityBuilder.buildSpaceMembershipEntity(space,
-                                                      userId,
-                                                      membershipType.getRole(),
-                                                      restPath,
-                                                      expand);
+      return buildSpaceMembershipEntity(space,
+                                        userId,
+                                        membershipType.getRole(),
+                                        restPath,
+                                        expand);
     } else {
       return null; // NOSONAR
     }
@@ -1018,11 +1043,11 @@ private static List<DataEntity> buildSpaceMemberships(Space space,
                                                         String restPath,
                                                         String expand) {
     return Arrays.stream(getUsersSupplier(space, membershipType).get())
-                 .map(user -> EntityBuilder.buildSpaceMembershipEntity(space,
-                                                                       user,
-                                                                       membershipType.getRole(),
-                                                                       restPath,
-                                                                       expand))
+                 .map(user -> buildSpaceMembershipEntity(space,
+                                                         user,
+                                                         membershipType.getRole(),
+                                                         restPath,
+                                                         expand))
                  .toList();
   }
 
@@ -1079,20 +1104,20 @@ private static BiPredicate<Space, String> getMembershipTypePredicate(SpaceServic
    * service
    *
    * @param space the provided space
-   * @param userId the user's remote id
+   * @param username the user's remote id
    * @param type membership type
    * @param restPath base REST path
    * @param expand which fields to expand from space
    * @return a hash map
    */
   public static SpaceMembershipEntity buildEntityFromSpaceMembership(Space space,
-                                                                     String userId,
+                                                                     String username,
                                                                      String type,
                                                                      String restPath,
                                                                      String expand) {
     updateCachedEtagValue(getEtagValue(type));
 
-    String id = space.getPrettyName() + ":" + userId + ":" + type;
+    String id = space.getPrettyName() + ":" + username + ":" + type;
     SpaceMembershipEntity spaceMembership = new SpaceMembershipEntity(id);
     spaceMembership.setHref(RestUtils.getRestUrl(SPACES_MEMBERSHIP_TYPE, id, restPath));
 
@@ -1105,16 +1130,17 @@ public static SpaceMembershipEntity buildEntityFromSpaceMembership(Space space,
 
     LinkEntity userEntity;
     if (expandFields.contains(USERS_TYPE)) {
-      Identity identity = getIdentityManager().getOrCreateUserIdentity(userId);
+      Identity identity = getIdentityManager().getOrCreateUserIdentity(username);
       Profile profile = identity == null ? null : identity.getProfile();
       userEntity = profile == null ? null : new LinkEntity(buildEntityProfile(space, profile, restPath, expand));
     } else {
-      userEntity = new LinkEntity(RestUtils.getRestUrl(USERS_TYPE, userId, restPath));
+      userEntity = new LinkEntity(RestUtils.getRestUrl(USERS_TYPE, username, restPath));
     }
     spaceMembership.setDataUser(userEntity);
+    spaceMembership.setUsername(username);
 
     if (expandFields.contains(CREATED_DATE)) {
-      Instant createdDate = getSpaceService().getSpaceMembershipDate(Long.parseLong(space.getId()), userId);
+      Instant createdDate = getSpaceService().getSpaceMembershipDate(Long.parseLong(space.getId()), username);
       if (createdDate != null && getSpaceService().canManageSpace(space, getCurrentUserName())) {
         spaceMembership.getDataEntity().put(CREATED_DATE, createdDate.toEpochMilli());
       }
@@ -1122,11 +1148,12 @@ public static SpaceMembershipEntity buildEntityFromSpaceMembership(Space space,
 
     LinkEntity spaceEntity;
     if (expandFields.contains(SPACES_TYPE)) {
-      spaceEntity = new LinkEntity(buildEntityFromSpace(space, userId, restPath, expand));
+      spaceEntity = new LinkEntity(buildEntityFromSpace(space, username, restPath, expand));
     } else {
       spaceEntity = new LinkEntity(RestUtils.getRestUrl(SPACES_TYPE, space.getId(), restPath));
     }
     spaceMembership.setDataSpace(spaceEntity);
+    spaceMembership.setSpaceId(space.getId());
 
     spaceMembership.setRole(type);
     switch (type) {
@@ -1191,25 +1218,25 @@ public static ActivityEntity buildEntityFromActivity(ExoSocialActivity activity,
 
     LinkEntity commentLink;
     if (expandFields.contains(COMMENTS_TYPE)) {
-      List<DataEntity> commentsEntity = EntityBuilder.buildEntityFromComment(activity,
-                                                                             authentiatedUser,
-                                                                             restPath,
-                                                                             "",
-                                                                             false,
-                                                                             RestUtils.DEFAULT_OFFSET,
-                                                                             RestUtils.DEFAULT_LIMIT);
+      List<DataEntity> commentsEntity = buildEntityFromComment(activity,
+                                                               authentiatedUser,
+                                                               restPath,
+                                                               "",
+                                                               false,
+                                                               RestUtils.DEFAULT_OFFSET,
+                                                               RestUtils.DEFAULT_LIMIT);
       RealtimeListAccess<ExoSocialActivity> listAccess = getActivityManager().getCommentsWithListAccess(activity, true);
 
       commentLink = new LinkEntity(commentsEntity);
       activityEntity.setCommentsCount(listAccess.getSize());
     } else if (expandFields.contains(COMMENTS_PREVIEW_TYPE)) {
-      List<DataEntity> commentsEntity = EntityBuilder.buildEntityFromComment(activity,
-                                                                             authentiatedUser,
-                                                                             restPath,
-                                                                             expand,
-                                                                             true,
-                                                                             0,
-                                                                             COMMENTS_PREVIEW_LIMIT);
+      List<DataEntity> commentsEntity = buildEntityFromComment(activity,
+                                                               authentiatedUser,
+                                                               restPath,
+                                                               expand,
+                                                               true,
+                                                               0,
+                                                               COMMENTS_PREVIEW_LIMIT);
       RealtimeListAccess<ExoSocialActivity> listAccess = getActivityManager().getCommentsWithListAccess(activity, true);
 
       commentLink = new LinkEntity(commentsEntity);
@@ -1221,11 +1248,11 @@ public static ActivityEntity buildEntityFromActivity(ExoSocialActivity activity,
     activityEntity.setComments(commentLink);
 
     if (expandFields.contains(LIKES_TYPE)) {
-      List<DataEntity> likesEntity = EntityBuilder.buildEntityFromLike(activity,
-                                                                       restPath,
-                                                                       "",
-                                                                       RestUtils.DEFAULT_OFFSET,
-                                                                       DEFAULT_LIKERS_LIMIT);
+      List<DataEntity> likesEntity = buildEntityFromLike(activity,
+                                                         restPath,
+                                                         "",
+                                                         RestUtils.DEFAULT_OFFSET,
+                                                         DEFAULT_LIKERS_LIMIT);
       activityEntity.setLikes(new LinkEntity(likesEntity));
     } else {
       activityEntity.setLikes(new LinkEntity(getLikesActivityRestUrl(activity.getId(), restPath)));
@@ -1540,11 +1567,11 @@ public static List<DataEntity> buildRelationshipEntities(List<Relationship> rela
     List<DataEntity> infos = new ArrayList<>();
     for (Relationship relationship : relationships) {
       //
-      infos.add(EntityBuilder.buildEntityRelationship(relationship,
-                                                      uriInfo.getPath(),
-                                                      RestUtils.getQueryParam(uriInfo, "expand"),
-                                                      true)
-                             .getDataEntity());
+      infos.add(buildEntityRelationship(relationship,
+                                        uriInfo.getPath(),
+                                        RestUtils.getQueryParam(uriInfo, "expand"),
+                                        true)
+                                             .getDataEntity());
     }
     return infos;
   }
diff --git a/component/service/src/main/java/org/exoplatform/social/rest/entity/BaseEntity.java b/component/service/src/main/java/org/exoplatform/social/rest/entity/BaseEntity.java
index af9d6b15de0..0dc2f141486 100644
--- a/component/service/src/main/java/org/exoplatform/social/rest/entity/BaseEntity.java
+++ b/component/service/src/main/java/org/exoplatform/social/rest/entity/BaseEntity.java
@@ -22,12 +22,28 @@
 import org.apache.commons.lang3.StringUtils;
 import org.json.JSONObject;
 
+import lombok.EqualsAndHashCode;
+import lombok.EqualsAndHashCode.Exclude;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@EqualsAndHashCode
+@NoArgsConstructor
 public class BaseEntity implements Serializable {
   private static final long serialVersionUID = -7245526640639649852L;
-  private DataEntity dataEntity = new DataEntity();
-  private long lastUpdatedTime;
 
-  public BaseEntity() {
+  private DataEntity        dataEntity       = new DataEntity();
+
+  @Exclude
+  @Getter
+  @Setter
+  private long              lastUpdatedTime;
+
+  public BaseEntity(String id) {
+    if (!StringUtils.isEmpty(id)) {
+      setId(id);
+    }
   }
 
   public BaseEntity setProperty(String name, Object value) {
@@ -47,12 +63,6 @@ protected String getString(String name) {
     return String.valueOf(o);
   }
 
-  public BaseEntity(String id) {
-    if (!StringUtils.isEmpty(id)) {
-      setId(id);
-    }
-  }
-
   public BaseEntity setId(String id) {
     setProperty("id", id);
     return this;
@@ -66,7 +76,7 @@ public BaseEntity setHref(String href) {
     setProperty("href", href);
     return this;
   }
-  
+
   public String getHref() {
     return (String) dataEntity.get("href");
   }
@@ -88,11 +98,4 @@ public JSONObject toJSONObject() {
     return new JSONObject(this);
   }
 
-    public void setLastUpdatedTime(long lastUpdatedTime) {
-        this.lastUpdatedTime = lastUpdatedTime;
-    }
-
-    public long getLastUpdatedTime() {
-        return lastUpdatedTime;
-    }
 }
diff --git a/component/service/src/main/java/org/exoplatform/social/rest/entity/CollectionEntity.java b/component/service/src/main/java/org/exoplatform/social/rest/entity/CollectionEntity.java
index 9f40616400a..6633a3a86f1 100644
--- a/component/service/src/main/java/org/exoplatform/social/rest/entity/CollectionEntity.java
+++ b/component/service/src/main/java/org/exoplatform/social/rest/entity/CollectionEntity.java
@@ -23,9 +23,14 @@
 import java.util.Map;
 
 import org.exoplatform.social.rest.api.RestUtils;
+
+import lombok.EqualsAndHashCode;
+
 import org.json.JSONObject;
 
+@EqualsAndHashCode(callSuper = true)
 public class CollectionEntity extends LinkedHashMap<String, Object> {
+
   private static final long serialVersionUID = 5157400162426650346L;
 
   private final String      key;
diff --git a/component/service/src/main/java/org/exoplatform/social/rest/entity/DataEntity.java b/component/service/src/main/java/org/exoplatform/social/rest/entity/DataEntity.java
index 91d008e996a..209c30ca2c9 100644
--- a/component/service/src/main/java/org/exoplatform/social/rest/entity/DataEntity.java
+++ b/component/service/src/main/java/org/exoplatform/social/rest/entity/DataEntity.java
@@ -22,11 +22,12 @@
 import org.apache.commons.lang3.StringUtils;
 import org.json.JSONObject;
 
+import lombok.EqualsAndHashCode;
+
+@EqualsAndHashCode(callSuper = true)
 public class DataEntity extends LinkedHashMap<String, Object> {
-  private static final long serialVersionUID = -7245526640639649852L;
 
-  public DataEntity() {
-  }
+  private static final long serialVersionUID = -7245526640639649852L;
 
   public DataEntity setProperty(String name, Object value) {
     if (value != null && StringUtils.isNotEmpty(String.valueOf(value))) {
@@ -43,4 +44,5 @@ public String toString() {
   public JSONObject toJSONObject() {
     return new JSONObject(this);
   }
+
 }
diff --git a/component/service/src/main/java/org/exoplatform/social/rest/entity/SpaceEntity.java b/component/service/src/main/java/org/exoplatform/social/rest/entity/SpaceEntity.java
index 134106c6e65..e4807105def 100644
--- a/component/service/src/main/java/org/exoplatform/social/rest/entity/SpaceEntity.java
+++ b/component/service/src/main/java/org/exoplatform/social/rest/entity/SpaceEntity.java
@@ -22,6 +22,9 @@
 
 import org.exoplatform.social.core.identity.model.Identity;
 
+import lombok.EqualsAndHashCode;
+
+@EqualsAndHashCode(callSuper = true)
 public class SpaceEntity extends BaseEntity {
   private static final long serialVersionUID = -5407676622915680099L;
 
@@ -114,6 +117,15 @@ public Long getPublicSiteId() {
     return (Long) getProperty("publicSiteId");
   }
 
+  public SpaceEntity setPublicSiteName(String publicSiteName) {
+    setProperty("publicSiteName", publicSiteName);
+    return this;
+  }
+
+  public String getPublicSiteName() {
+    return (String) getProperty("publicSiteName");
+  }
+
   public SpaceEntity setPublicSiteVisibility(String publicSiteVisibility) {
     setProperty("publicSiteVisibility", publicSiteVisibility);
     return this;
@@ -236,6 +248,15 @@ public Boolean getCanEdit() {
     return (Boolean) getProperty("canEdit");
   }
 
+  public SpaceEntity setCanRedactOnSpace(boolean canRedactOnSpace) {
+    setProperty("canRedactOnSpace", canRedactOnSpace);
+    return this;
+  }
+
+  public Boolean getCanRedactOnSpace() {
+    return (Boolean) getProperty("canRedactOnSpace");
+  }
+
   public SpaceEntity setCanEditNavigations(boolean canEditNavigations) {
     setProperty("canEditNavigations", canEditNavigations);
     return this;
@@ -298,7 +319,7 @@ public SpaceEntity setPublishers(LinkEntity publishers) {
   public String getPublishers() {
     return getString("publishers");
   }
-  
+
   public SpaceEntity setPublishersCount(int publishersCount) {
     setProperty("publishersCount", publishersCount);
     return this;
diff --git a/component/service/src/main/java/org/exoplatform/social/rest/entity/SpaceMembershipEntity.java b/component/service/src/main/java/org/exoplatform/social/rest/entity/SpaceMembershipEntity.java
index 11bca370929..d261d276388 100644
--- a/component/service/src/main/java/org/exoplatform/social/rest/entity/SpaceMembershipEntity.java
+++ b/component/service/src/main/java/org/exoplatform/social/rest/entity/SpaceMembershipEntity.java
@@ -32,12 +32,12 @@ public SpaceMembershipEntity setDataUser(LinkEntity user) {
     return this;
   }
 
-  public void setUser(String user) {
-    setProperty("user", user);
+  public void setUsername(String username) {
+    setProperty("username", username);
   }
 
-  public String getUser() {
-    return getString("user");
+  public String getUsername() {
+    return getString("username");
   }
 
   public SpaceMembershipEntity setDataSpace(LinkEntity space) {
@@ -45,12 +45,12 @@ public SpaceMembershipEntity setDataSpace(LinkEntity space) {
     return this;
   }
 
-  public void setSpace(String space) {
-    setProperty("space", space);
+  public void setSpaceId(String spaceId) {
+    setProperty("spaceId", spaceId);
   }
 
-  public String getSpace() {
-    return getString("space");
+  public String getSpaceId() {
+    return getString("spaceId");
   }
 
   public SpaceMembershipEntity setRole(String role) {
diff --git a/component/service/src/main/java/org/exoplatform/social/rest/entity/SpaceMembershipUpdateEntity.java b/component/service/src/main/java/org/exoplatform/social/rest/entity/SpaceMembershipUpdateEntity.java
new file mode 100644
index 00000000000..e931942ab9c
--- /dev/null
+++ b/component/service/src/main/java/org/exoplatform/social/rest/entity/SpaceMembershipUpdateEntity.java
@@ -0,0 +1,35 @@
+/*
+ * This file is part of the Meeds project (https://meeds.io/).
+ *
+ * Copyright (C) 2020 - 2024 Meeds Association contact@meeds.io
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+package org.exoplatform.social.rest.entity;
+
+import lombok.Data;
+
+@Data
+public class SpaceMembershipUpdateEntity {
+
+  private String user;
+
+  private String space;
+
+  private String status;
+
+  private String role;
+
+}
diff --git a/component/service/src/main/java/org/exoplatform/social/rest/impl/space/SpaceRest.java b/component/service/src/main/java/org/exoplatform/social/rest/impl/space/SpaceRest.java
index 56acbd3cd82..2d75a8d0533 100644
--- a/component/service/src/main/java/org/exoplatform/social/rest/impl/space/SpaceRest.java
+++ b/component/service/src/main/java/org/exoplatform/social/rest/impl/space/SpaceRest.java
@@ -20,16 +20,13 @@
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.ArrayList;
+import java.time.Instant;
+import java.time.temporal.ChronoUnit;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 import java.util.Locale;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Objects;
-import java.util.stream.Collectors;
 
 import javax.annotation.security.RolesAllowed;
 import javax.ws.rs.DELETE;
@@ -48,17 +45,16 @@
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Request;
 import javax.ws.rs.core.Response;
+import javax.ws.rs.core.Response.ResponseBuilder;
 import javax.ws.rs.core.Response.Status;
 import javax.ws.rs.core.UriInfo;
 
 import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.collections.MapUtils;
 import org.apache.commons.lang3.StringUtils;
 
 import org.exoplatform.commons.utils.CommonsUtils;
 import org.exoplatform.commons.utils.IOUtil;
 import org.exoplatform.commons.utils.ListAccess;
-import org.exoplatform.container.ExoContainerContext;
 import org.exoplatform.container.PortalContainer;
 import org.exoplatform.deprecation.DeprecatedAPI;
 import org.exoplatform.portal.config.model.Page;
@@ -89,9 +85,7 @@
 import org.exoplatform.social.core.space.SpaceUtils;
 import org.exoplatform.social.core.space.model.Space;
 import org.exoplatform.social.core.space.spi.SpaceService;
-import org.exoplatform.social.notification.service.SpaceWebNotificationService;
 import org.exoplatform.social.rest.api.EntityBuilder;
-import org.exoplatform.social.rest.api.RestProperties;
 import org.exoplatform.social.rest.api.RestUtils;
 import org.exoplatform.social.rest.entity.ActivityEntity;
 import org.exoplatform.social.rest.entity.BaseEntity;
@@ -106,6 +100,7 @@
 
 import io.meeds.portal.security.constant.UserRegistrationType;
 import io.meeds.portal.security.service.SecuritySettingService;
+import io.meeds.social.util.JsonUtils;
 
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
@@ -142,8 +137,12 @@ public class SpaceRest implements ResourceContainer {
 
   private static final CacheControl    CACHE_REVALIDATE_CONTROL    = new CacheControl();
 
+  public static final String           PROFILE_DEFAULT_BANNER_URL  = "/skin/images/banner/DefaultSpaceBanner.png";
+
   private static final Date            DEFAULT_IMAGES_LAST_MODIFED = new Date();
 
+  private static final long            DEFAULT_IMAGES_HASH         = DEFAULT_IMAGES_LAST_MODIFED.getTime();
+
   // 7 days
   private static final int             CACHE_IN_SECONDS            = 7 * 86400;
 
@@ -161,6 +160,8 @@ public class SpaceRest implements ResourceContainer {
 
   private final ImageThumbnailService  imageThumbnailService;
 
+  private byte[]                       defaultSpaceBanner          = null;
+
   private byte[]                       defaultSpaceAvatar          = null;
 
   public SpaceRest(ActivityRest activityRestResourcesV1,
@@ -281,36 +282,12 @@ public Response getSpaces( // NOSONAR
     } else {
       spaces = Collections.emptyList();
     }
-    List<DataEntity> spaceInfos = new ArrayList<>();
-    for (Space space : spaces) {
-      SpaceEntity spaceInfo = EntityBuilder.buildEntityFromSpace(space, authenticatedUser, uriInfo.getPath(), expand);
-      spaceInfos.add(spaceInfo.getDataEntity());
-    }
-
-    CollectionEntity collectionSpace = new CollectionEntity(spaceInfos, EntityBuilder.SPACES_TYPE, offset, limit);
+    CollectionEntity collectionSpace = EntityBuilder.buildEntityFromSpaces(spaces, authenticatedUser, offset, limit, expand, uriInfo);
     if (returnSize) {
       collectionSpace.setSize(listAccess.getSize());
     }
 
-    if (StringUtils.isNotBlank(expand) && Arrays.asList(StringUtils.split(expand, ",")).contains(RestProperties.UNREAD)) {
-      SpaceWebNotificationService spaceWebNotificationService = ExoContainerContext.getService(SpaceWebNotificationService.class);
-      Map<Long, Long> unreadItemsPerSpace = spaceWebNotificationService.countUnreadItemsBySpace(authenticatedUser);
-      if (MapUtils.isNotEmpty(unreadItemsPerSpace)) {
-        collectionSpace.setUnreadPerSpace(unreadItemsPerSpace.entrySet()
-                                                             .stream()
-                                                             .collect(Collectors.toMap(e -> e.getKey().toString(),
-                                                                                       Entry::getValue)));
-      }
-    }
-
-    EntityTag eTag = new EntityTag(String.valueOf(Objects.hash(spaceInfos,
-                                                               spaceFilter,
-                                                               filterType,
-                                                               offset,
-                                                               limit,
-                                                               returnSize,
-                                                               expand,
-                                                               authenticatedUser)));
+    EntityTag eTag = new EntityTag(String.valueOf(JsonUtils.toJsonString(collectionSpace).hashCode()));
     Response.ResponseBuilder builder = request.evaluatePreconditions(eTag);
     if (builder == null) {
       builder = EntityBuilder.getResponseBuilder(collectionSpace, uriInfo, RestUtils.getJsonMediaType(), Response.Status.OK);
@@ -393,8 +370,9 @@ public Response createSpace(
                           @ApiResponse(responseCode = "500", description = "Internal server error"),
                           @ApiResponse(responseCode = "404", description = "Resource not found"),
                           @ApiResponse(responseCode = "400", description = "Invalid query input") })
-  public Response isSpaceContainsExternals(@Context
-  UriInfo uriInfo,
+  public Response isSpaceContainsExternals(
+                                           @Context
+                                           UriInfo uriInfo,
                                            @Context
                                            Request request,
                                            @Parameter(description = "Space Id", required = true)
@@ -458,8 +436,9 @@ public Response getSpaceById(
                           @ApiResponse(responseCode = "200", description = "Request fulfilled"),
                           @ApiResponse(responseCode = "500", description = "Internal server error"),
                           @ApiResponse(responseCode = "400", description = "Invalid query input") })
-  public Response getSpaceByPrettyName(@Context
-  UriInfo uriInfo,
+  public Response getSpaceByPrettyName(
+                                       @Context
+                                       UriInfo uriInfo,
                                        @Context
                                        Request request,
                                        @Parameter(description = "Space id", required = true)
@@ -487,8 +466,9 @@ public Response getSpaceByPrettyName(@Context
                           @ApiResponse(responseCode = "200", description = "Request fulfilled"),
                           @ApiResponse(responseCode = "500", description = "Internal server error"),
                           @ApiResponse(responseCode = "400", description = "Invalid query input") })
-  public Response getSpaceByGroupSuffix(@Context
-  UriInfo uriInfo,
+  public Response getSpaceByGroupSuffix(
+                                        @Context
+                                        UriInfo uriInfo,
                                         @Context
                                         Request request,
                                         @Parameter(description = "Space id", required = true)
@@ -514,8 +494,9 @@ public Response getSpaceByGroupSuffix(@Context
                           @ApiResponse(responseCode = "200", description = "Request fulfilled"),
                           @ApiResponse(responseCode = "500", description = "Internal server error"),
                           @ApiResponse(responseCode = "400", description = "Invalid query input") })
-  public Response getSpaceByDisplayName(@Context
-  UriInfo uriInfo,
+  public Response getSpaceByDisplayName(
+                                        @Context
+                                        UriInfo uriInfo,
                                         @Context
                                         Request request,
                                         @Parameter(description = "Space id", required = true)
@@ -542,8 +523,9 @@ public Response getSpaceByDisplayName(@Context
                           @ApiResponse(responseCode = "500", description = "Internal server error"),
                           @ApiResponse(responseCode = "400", description = "Invalid query input"),
                           @ApiResponse(responseCode = "404", description = "Resource not found") })
-  public Response getSpaceAvatarById(@Context
-  UriInfo uriInfo,
+  public Response getSpaceAvatarById(
+                                     @Context
+                                     UriInfo uriInfo,
                                      @Context
                                      Request request,
                                      @Parameter(description = "The value of lastModified parameter will determine whether the query should be cached by browser or not. If not set, no 'expires HTTP Header will be sent'")
@@ -651,8 +633,9 @@ public Response getSpaceAvatarById(@Context
                           @ApiResponse(responseCode = "500", description = "Internal server error"),
                           @ApiResponse(responseCode = "400", description = "Invalid query input"),
                           @ApiResponse(responseCode = "404", description = "Resource not found") })
-  public Response getSpaceBannerById(@Context
-  UriInfo uriInfo,
+  public Response getSpaceBannerById(
+                                     @Context
+                                     UriInfo uriInfo,
                                      @Context
                                      Request request,
                                      @Parameter(description = "The value of lastModified parameter will determine whether the query should be cached by browser or not. If not set, no 'expires HTTP Header will be sent'")
@@ -671,11 +654,12 @@ public Response getSpaceBannerById(@Context
                                      @QueryParam("r")
                                      String token) throws IOException {
     boolean isDefault = StringUtils.equals(LinkProvider.DEFAULT_IMAGE_REMOTE_ID, id);
-    if (isDefault) {
-      return Response.status(Status.NOT_FOUND).build();
-    }
+    Identity identity = null;
+    Long lastUpdated = null;
 
-    if (RestUtils.isAnonymous() && !LinkProvider.isAttachmentTokenValid(token,
+    if (!isDefault
+        && RestUtils.isAnonymous()
+        && !LinkProvider.isAttachmentTokenValid(token,
                                                                         SpaceIdentityProvider.NAME,
                                                                         id,
                                                                         BannerAttachment.TYPE,
@@ -684,39 +668,47 @@ public Response getSpaceBannerById(@Context
       return Response.status(Status.NOT_FOUND).build();
     }
 
-    String authenticatedUser = RestUtils.getCurrentUser();
-    Space space = byId ? spaceService.getSpaceById(id) : spaceService.getSpaceByPrettyName(id);
-    if (space == null
-        || (Space.HIDDEN.equals(space.getVisibility())
-            && !spaceService.canViewSpace(space, authenticatedUser))) {
-      return Response.status(Status.NOT_FOUND).build();
-    }
-    Identity identity = identityManager.getOrCreateIdentity(SpaceIdentityProvider.NAME, space.getPrettyName());
-    //
-    Profile profile = identity.getProfile();
-    Long lastUpdated = null;
-    if (profile != null) {
-      lastUpdated = profile.getBannerLastUpdated();
+    if (!isDefault) {
+      String authenticatedUser = RestUtils.getCurrentUser();
+      Space space = byId ? spaceService.getSpaceById(id) : spaceService.getSpaceByPrettyName(id);
+      if (space == null
+          || (Space.HIDDEN.equals(space.getVisibility())
+              && !spaceService.canViewSpace(space, authenticatedUser))) {
+        return Response.status(Status.NOT_FOUND).build();
+      }
+      identity = identityManager.getOrCreateIdentity(SpaceIdentityProvider.NAME, space.getPrettyName());
+      //
+      Profile profile = identity.getProfile();
+      if (profile != null) {
+        lastUpdated = profile.getBannerLastUpdated();
+      }
     }
     EntityTag eTag = null;
-    if (lastUpdated != null) {
+    if (isDefault) {
+      eTag = new EntityTag(String.valueOf(DEFAULT_IMAGES_HASH));
+    } else if (lastUpdated != null) {
       eTag = new EntityTag(Integer.toString(lastUpdated.hashCode()));
     }
+
     //
     Response.ResponseBuilder builder = (eTag == null ? null : request.evaluatePreconditions(eTag));
     if (builder == null) {
-      InputStream stream = identityManager.getBannerInputStream(identity);
-      if (stream == null) {
-        throw new WebApplicationException(Response.Status.NOT_FOUND);
+      if (isDefault) {
+        builder = getDefaultBannerBuilder();
+      } else {
+        InputStream stream = identityManager.getBannerInputStream(identity);
+        if (stream == null) {
+          throw new WebApplicationException(Response.Status.NOT_FOUND);
+        }
+        /*
+         * As recommended in the the RFC1341
+         * (https://www.w3.org/Protocols/rfc1341/4_Content-Type.html), we set the
+         * banner content-type to "image/png". So, its data would be recognized as
+         * "image" by the user-agent.
+         */
+        builder = Response.ok(stream, "image/png");
+        builder.tag(eTag);
       }
-      /*
-       * As recommended in the the RFC1341
-       * (https://www.w3.org/Protocols/rfc1341/4_Content-Type.html), we set the
-       * banner content-type to "image/png". So, its data would be recognized as
-       * "image" by the user-agent.
-       */
-      builder = Response.ok(stream, "image/png");
-      builder.tag(eTag);
     }
     builder.cacheControl(CACHE_CONTROL);
     builder.lastModified(lastUpdated == null ? DEFAULT_IMAGES_LAST_MODIFED : new Date(lastUpdated));
@@ -840,8 +832,9 @@ public Response updateSpaceById(
                           @ApiResponse(responseCode = "200", description = "Request fulfilled"),
                           @ApiResponse(responseCode = "500", description = "Internal server error"),
                           @ApiResponse(responseCode = "400", description = "Invalid query input") })
-  public Response deleteSpaceById(@Context
-  UriInfo uriInfo,
+  public Response deleteSpaceById(
+                                  @Context
+                                  UriInfo uriInfo,
                                   @Parameter(description = "Space id", required = true)
                                   @PathParam("id")
                                   String id,
@@ -919,7 +912,6 @@ public Response getSpaceMembers(
       throw new WebApplicationException(Response.Status.UNAUTHORIZED);
     }
 
-    long cacheTime = space.getCacheTime();
     if (StringUtils.isBlank(role)) {
       role = SpaceMemberFilterListAccess.Type.MEMBER.name();
     }
@@ -952,14 +944,13 @@ public Response getSpaceMembers(
       collectionUser.setSize(spaceIdentitiesListAccess.getSize());
     }
 
-    String eTagValue = String.valueOf(Objects.hash(collectionUser.hashCode(), authenticatedUser, expand));
-    EntityTag eTag = new EntityTag(eTagValue);
+    EntityTag eTag = new EntityTag(String.valueOf(JsonUtils.toJsonString(collectionUser).hashCode()));
     Response.ResponseBuilder builder = request.evaluatePreconditions(eTag);
     if (builder == null) {
       builder = Response.ok(collectionUser, MediaType.APPLICATION_JSON);
       builder.tag(eTag);
-      builder.lastModified(new Date(cacheTime));
-      builder.expires(new Date(cacheTime));
+      builder.lastModified(new Date());
+      builder.expires(Date.from(Instant.now().plus(7, ChronoUnit.DAYS)));
     }
     return builder.build();
   }
@@ -1338,19 +1329,34 @@ private Response buildSpaceResponse(Space space, String expand, UriInfo uriInfo,
       throw new WebApplicationException(Response.Status.UNAUTHORIZED);
     }
 
-    long cacheTime = space.getCacheTime();
-    String eTagValue = String.valueOf(Objects.hash(cacheTime, authenticatedUser, expand));
-
-    EntityTag eTag = new EntityTag(eTagValue, true);
+    SpaceEntity spaceEntity = EntityBuilder.buildEntityFromSpace(space, authenticatedUser, uriInfo.getPath(), expand);
+    EntityTag eTag = new EntityTag(String.valueOf(spaceEntity.hashCode()));
     Response.ResponseBuilder builder = request.evaluatePreconditions(eTag);
     if (builder == null) {
-      SpaceEntity spaceEntity = EntityBuilder.buildEntityFromSpace(space, authenticatedUser, uriInfo.getPath(), expand);
       builder = Response.ok(spaceEntity.getDataEntity(), MediaType.APPLICATION_JSON);
       builder.tag(eTag);
-      builder.lastModified(new Date(cacheTime));
-      builder.expires(new Date(cacheTime));
+      builder.lastModified(new Date());
+      builder.cacheControl(CACHE_REVALIDATE_CONTROL);
     }
     return builder.build();
   }
 
+  private Response.ResponseBuilder getDefaultBannerBuilder() throws IOException {
+    if (defaultSpaceBanner == null) {
+      InputStream is = PortalContainer.getInstance().getPortalContext().getResourceAsStream(PROFILE_DEFAULT_BANNER_URL);
+      if (is == null) {
+        LOG.warn("Can't find default user banner file in location {}", PROFILE_DEFAULT_BANNER_URL);
+        defaultSpaceBanner = new byte[] {};
+      } else {
+        defaultSpaceBanner = IOUtil.getStreamContentAsBytes(is);
+      }
+    }
+
+    ResponseBuilder builder = Response.ok(new ByteArrayInputStream(defaultSpaceBanner), "image/png");
+    builder.lastModified(DEFAULT_IMAGES_LAST_MODIFED);
+    EntityTag eTag = new EntityTag(String.valueOf(DEFAULT_IMAGES_HASH));
+    builder.tag(eTag);
+    return builder;
+  }
+
 }
diff --git a/component/service/src/main/java/org/exoplatform/social/rest/impl/spacemembership/SpaceMembershipRest.java b/component/service/src/main/java/org/exoplatform/social/rest/impl/spacemembership/SpaceMembershipRest.java
index 4c5de24c9fb..31a950852ac 100644
--- a/component/service/src/main/java/org/exoplatform/social/rest/impl/spacemembership/SpaceMembershipRest.java
+++ b/component/service/src/main/java/org/exoplatform/social/rest/impl/spacemembership/SpaceMembershipRest.java
@@ -50,7 +50,7 @@
 import org.exoplatform.social.rest.api.RestUtils;
 import org.exoplatform.social.rest.entity.CollectionEntity;
 import org.exoplatform.social.rest.entity.DataEntity;
-import org.exoplatform.social.rest.entity.SpaceMembershipEntity;
+import org.exoplatform.social.rest.entity.SpaceMembershipUpdateEntity;
 import org.exoplatform.social.service.rest.api.VersionResources;
 
 import io.meeds.social.space.constant.SpaceMembershipStatus;
@@ -73,11 +73,14 @@ public class SpaceMembershipRest implements ResourceContainer {
   private IdentityManager identityManager;
 
   public enum MembershipType {
-    PENDING(SpaceUtils.PENDING, SpaceMembershipStatus.PENDING), APPROVED(SpaceUtils.MEMBER,
-        SpaceMembershipStatus.MEMBER), IGNORED(SpaceUtils.IGNORED, SpaceMembershipStatus.IGNORED), INVITED(
-            SpaceUtils.INVITED, SpaceMembershipStatus.INVITED), MEMBER(SpaceUtils.MEMBER, SpaceMembershipStatus.MEMBER), MANAGER(
-                SpaceUtils.MANAGER, SpaceMembershipStatus.MANAGER), PUBLISHER(SpaceUtils.PUBLISHER,
-                    SpaceMembershipStatus.PUBLISHER), REDACTOR(SpaceUtils.REDACTOR, SpaceMembershipStatus.REDACTOR);
+    PENDING(SpaceUtils.PENDING, SpaceMembershipStatus.PENDING),
+    APPROVED(SpaceUtils.MEMBER, SpaceMembershipStatus.MEMBER),
+    IGNORED(SpaceUtils.IGNORED, SpaceMembershipStatus.IGNORED),
+    INVITED(SpaceUtils.INVITED, SpaceMembershipStatus.INVITED),
+    MEMBER(SpaceUtils.MEMBER, SpaceMembershipStatus.MEMBER),
+    MANAGER(SpaceUtils.MANAGER, SpaceMembershipStatus.MANAGER),
+    PUBLISHER(SpaceUtils.PUBLISHER, SpaceMembershipStatus.PUBLISHER),
+    REDACTOR(SpaceUtils.REDACTOR, SpaceMembershipStatus.REDACTOR);
 
     @Getter
     private final SpaceMembershipStatus status;
@@ -232,7 +235,7 @@ public Response addSpacesMemberships(
                                            "<br />\"user\": \"john\"," +
                                            "<br />\"space\": \"1552\"" +
                                            "<br />}", required = true)
-                                       SpaceMembershipEntity model) {
+                                       SpaceMembershipUpdateEntity model) {
     if (model == null) {
       throw new WebApplicationException(Response.Status.BAD_REQUEST);
     }
@@ -357,7 +360,7 @@ public Response deleteSpaceMembershipById(
                                                 "<br />\"user\": \"john\"," +
                                                 "<br />\"space\": \"1552\"" +
                                                 "<br />}", required = true)
-                                            SpaceMembershipEntity model) {
+                                            SpaceMembershipUpdateEntity model) {
     if (model == null) {
       throw new WebApplicationException(Response.Status.BAD_REQUEST);
     }
diff --git a/component/service/src/test/java/org/exoplatform/social/rest/impl/space/SpaceRestResourcesTest.java b/component/service/src/test/java/org/exoplatform/social/rest/impl/space/SpaceRestResourcesTest.java
index fbd35aa9651..73d2fe8b87c 100644
--- a/component/service/src/test/java/org/exoplatform/social/rest/impl/space/SpaceRestResourcesTest.java
+++ b/component/service/src/test/java/org/exoplatform/social/rest/impl/space/SpaceRestResourcesTest.java
@@ -494,7 +494,7 @@ public void testGetSpaceBannerForAnonymous() throws Exception {
 
     response = service("GET", getURLResource("spaces/" + LinkProvider.DEFAULT_IMAGE_REMOTE_ID + "/banner"), "", null, null);
     assertNotNull(response);
-    assertEquals(404, response.getStatus());
+    assertEquals(200, response.getStatus());
 
     space.setVisibility(Space.HIDDEN);
     space = spaceService.updateSpace(space);
@@ -528,7 +528,7 @@ public void testGetSpaceBannerForAuthentiticatedUser() throws Exception {
 
     response = service("GET", getURLResource("spaces/" + LinkProvider.DEFAULT_IMAGE_REMOTE_ID + "/banner"), "", null, null);
     assertNotNull(response);
-    assertEquals(404, response.getStatus());
+    assertEquals(200, response.getStatus());
 
     space.setVisibility(Space.HIDDEN);
     space = spaceService.updateSpace(space);
diff --git a/extension/war/src/main/webapp/WEB-INF/conf/social-extension/social/search-configuration.xml b/extension/war/src/main/webapp/WEB-INF/conf/social-extension/social/search-configuration.xml
index 6b76c51b24f..cb0119dbada 100644
--- a/extension/war/src/main/webapp/WEB-INF/conf/social-extension/social/search-configuration.xml
+++ b/extension/war/src/main/webapp/WEB-INF/conf/social-extension/social/search-configuration.xml
@@ -105,9 +105,6 @@
             <field name="jsModule">
               <string>SHARED/SpaceSearchResultCard</string>
             </field>
-            <field name="cssModule">
-              <string>social-portlet/SpaceSearch</string>
-            </field>
             <field name="i18nBundle">
               <string>locale.portlet.social.SpacesListApplication</string>
             </field>
diff --git a/webapp/portlet/pom.xml b/webapp/portlet/pom.xml
index f2e7906ceba..771a4fa81b7 100644
--- a/webapp/portlet/pom.xml
+++ b/webapp/portlet/pom.xml
@@ -113,14 +113,10 @@
                 <include>portlet/SpaceInfos/Style.less</include>
                 <include>portlet/SpaceMenu/Style.less</include>
                 <include>portlet/SpacesAdministration/Style.less</include>
-                <include>portlet/SpaceSearch/Style.less</include>
-                <include>portlet/SpaceSettings/Style.less</include>
-                <include>portlet/SpacesList/Style.less</include>
                 <include>portlet/SpacesListExternal/Style.less</include>
                 <include>portlet/SpacesOverview/Style.less</include>
                 <include>portlet/SuggestionsPeopleAndSpace/Style.less</include>
                 <include>portlet/TopBarMenu/Style.less</include>
-                <include>portlet/WhoIsOnLine/Style.less</include>
                 <include>portlet/VerticalMenu/Style.less</include>
                 <include>common/siteDetails/Style.less</include>
                 <include>common/AdministrationSite/Style.less</include>
diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesListApplication_en.properties b/webapp/portlet/src/main/resources/locale/portlet/social/SpacesListApplication_en.properties
index 0ae0f765220..4008a1e6bff 100644
--- a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesListApplication_en.properties
+++ b/webapp/portlet/src/main/resources/locale/portlet/social/SpacesListApplication_en.properties
@@ -30,6 +30,8 @@ spacesList.label.name=Name
 spacesList.label.spaceTemplate=Template
 spacesList.label.yes=Yes
 spacesList.label.no=No
+spacesList.label.cancel=Cancel
+spacesList.label.apply=Apply
 spacesList.label.hidden=Hidden
 spacesList.label.hiddenSpace=Hidden space
 spacesList.label.registration=Registration
@@ -53,7 +55,7 @@ spacesList.button.createSpace=Create
 spacesList.button.updateSpace=Update
 spacesList.button.showMore=Show more
 spacesList.button.remove=Remove
-spacesList.button.edit=Edit
+spacesList.button.openSettings=Open Settings
 spacesList.button.leave=Leave
 spacesList.button.acceptToJoin=Accept to join
 spacesList.button.refuseToJoin=Decline
@@ -66,8 +68,10 @@ spacesList.button.close=Close
 spacesList.button.continue=Continue
 spacesList.button.back=Back
 spacesList.button.cancel=Cancel
+spacesList.button.add=Add
 spacesList.filter.all=All spaces
 spacesList.filter.userSpaces=My spaces
+spacesList.filter.managingSpaces=Administrated Spaces
 spacesList.filter.favoriteSpaces=Favorite spaces
 spacesList.filter.invitedSpaces=Invitations
 spacesList.filter.pendingSpaces=Pending requests
@@ -78,3 +82,28 @@ spaceList.label.openSpaceMenu=Open Space Menu
 spaceList.label.openSpaceActionMenu=Open Space Action Menu
 spaceList.checkExternals.warning=Space {0} contains guest users
 spaceList.alert.label=space
+spaceList.advanced.filter.button.title=Filter
+spaceList.advanced.filter.drawer.title=Filter Spaces
+spaceList.advanced.filter.spaceType.label=Space Type
+spaceList.spaceAvatar.alt=Space Avatar
+spaceList.spaceMembers={0} Members
+spaceList.publicSite=Website
+spacesList.button.options=Space Options
+spacesList.button.answerInvitation=Answer
+spacesList.button.unreadActivities=Unread activities
+spacesList.label.pendingRequests={0} user requests are waiting for review
+spacesList.label.pendingRequests.description=Please find below, the user requests to join spaces you manage
+spacesList.label.invitationsSent=You are invited to join {0} spaces
+spacesList.label.usersRequests=You have sent {0} requests to join spaces
+spacesList.pending.drawer.title=Requests to review
+spacesList.pending.loadMore=Load More
+spacesList.pending.placeholder.emptyRequests=No remaining request to review
+spacesList.pending.placeholder.close=Close
+spacesList.pending.userAddedAsSpaceMember=The user is now a space member 
+spacesList.pending.userRequestDenied=User request successfully denied
+spacesList.pending.error.unknownErrorWhenSavingRoles=An unknown error happened when saving roles. Please contact your administrator.
+spacesList.button.copyLink=Copy Link
+spacesList.button.copyLink.success=Link copied in the clipboard
+spacesList.button.copyLink.error=Error while copying site URL
+spacesList.button.visitPublicSite=Visit public site
+spacesList.button.openSpace=Open Space
diff --git a/webapp/portlet/src/main/webapp/WEB-INF/gatein-resources.xml b/webapp/portlet/src/main/webapp/WEB-INF/gatein-resources.xml
index f290758ff98..177bc4c690f 100644
--- a/webapp/portlet/src/main/webapp/WEB-INF/gatein-resources.xml
+++ b/webapp/portlet/src/main/webapp/WEB-INF/gatein-resources.xml
@@ -62,8 +62,6 @@
     <application-name>social-portlet</application-name>
     <portlet-name>SpaceSettingPortlet</portlet-name>
     <skin-name>Enterprise</skin-name>
-    <css-path>/skin/css/portlet/SpaceSettings/Style.css</css-path>
-    <css-priority>1</css-priority>
     <additional-module>ImageCropper</additional-module>
   </portlet-skin>
 
@@ -99,14 +97,6 @@
     <css-priority>1</css-priority>
   </portlet-skin>
 
-  <portlet-skin>
-    <application-name>social-portlet</application-name>
-    <portlet-name>SpacesList</portlet-name>
-    <skin-name>Enterprise</skin-name>
-    <css-path>/skin/css/portlet/SpacesList/Style.css</css-path>
-    <css-priority>1</css-priority>
-  </portlet-skin>
-
   <portlet-skin>
     <application-name>social-portlet</application-name>
     <portlet-name>SpaceMenuPortlet</portlet-name>
@@ -180,14 +170,6 @@
     <css-priority>1</css-priority>
   </portlet-skin>
 
-  <portlet-skin>
-    <application-name>social-portlet</application-name>
-    <portlet-name>WhoIsOnLinePortlet</portlet-name>
-    <skin-name>Enterprise</skin-name>
-    <css-path>/skin/css/portlet/WhoIsOnLine/Style.css</css-path>
-    <css-priority>1</css-priority>
-  </portlet-skin>
-
   <portlet-skin>
     <application-name>social-portlet</application-name>
     <portlet-name>GettingStarted</portlet-name>
@@ -290,15 +272,6 @@
     <css-priority>1</css-priority>
   </portlet-skin>
 
-  <portlet-skin>
-    <application-name>social-portlet</application-name>
-    <!-- Not a portlet but a module. TODO : Enhance SkinService to manage CSS Modules a  done for JS -->
-    <portlet-name>SpaceSearch</portlet-name>
-    <skin-name>Enterprise</skin-name>
-    <css-path>/skin/css/portlet/SpaceSearch/Style.css</css-path>
-    <css-priority>1</css-priority>
-  </portlet-skin>
-
   <portlet-skin>
     <application-name>social-portlet</application-name>
     <!-- Not a portlet but a module. TODO : Enhance SkinService to manage CSS Modules a  done for JS -->
@@ -1182,6 +1155,9 @@
       <depends>
         <module>spacesListComponents</module>
       </depends>
+      <depends>
+        <module>applicationToolbarComponent</module>
+      </depends>
       <depends>
         <module>commonVueComponents</module>
       </depends>
diff --git a/webapp/portlet/src/main/webapp/WEB-INF/jsp/portlet/topbarLogo.jsp b/webapp/portlet/src/main/webapp/WEB-INF/jsp/portlet/topbarLogo.jsp
index 0478293cdd1..bf2097a74c3 100644
--- a/webapp/portlet/src/main/webapp/WEB-INF/jsp/portlet/topbarLogo.jsp
+++ b/webapp/portlet/src/main/webapp/WEB-INF/jsp/portlet/topbarLogo.jsp
@@ -35,6 +35,7 @@
   boolean isFavorite= false;
   boolean muted= false;
   boolean isMember =false;
+  boolean canRedactOnSpace =false;
   String authenticatedUser = request.getRemoteUser();
   List<Profile> managers = new ArrayList<>();
   String spaceDescription= "";
@@ -69,6 +70,7 @@
     spaceId = space.getId();
     SpaceService spaceService = ExoContainerContext.getService(SpaceService.class);
     isMember = authenticatedUser == null ? false : spaceService.isMember(space, authenticatedUser);
+    canRedactOnSpace = authenticatedUser == null ? false : spaceService.canRedactOnSpace(space, authenticatedUser);
     isFavorite = authenticatedUser == null ? false : favoriteService.isFavorite(new Favorite(space.DEFAULT_SPACE_METADATA_OBJECT_TYPE, space.getId(), null, Long.parseLong(userIdentity.getId())));
     muted = authenticatedUser == null ? false : userSetting.isSpaceMuted(Long.parseLong(spaceId));
     logoPath = space.getAvatarUrl();
@@ -88,12 +90,12 @@
 
   String directionVuetifyClass = requestContext.getOrientation().isRT() ? "v-application--is-rtl" : "v-application--is-ltr";
 %>
-<div class="VuetifyApp">
+<div class="VuetifyApp full-height">
   <div data-app="true"
-       class="v-application border-box-sizing <%= directionVuetifyClass %> theme--light"
+       class="v-application border-box-sizing full-height <%= directionVuetifyClass %> theme--light"
        id="brandingTopBar" flat="">
-    <div class="v-application--wrap">
-      <div class="container pa-0 ps-3">
+    <div class="v-application--wrap full-height">
+      <div class="container my-auto pa-0 ps-3">
         <div class="d-flex mx-0 pa-0">
           <% if (space == null) { %>
           <% if (logoPath != null) { %>
@@ -130,7 +132,8 @@
                 membersNumber: `<%=membersNumber%>`,
                 spaceDescription: `<%=URLEncoder.encode(spaceDescription.replace(" ", "._.")).replace("._.", " ")%>`,
                 managers: window.topbarLogoManagers,
-                homePath: `<%=homePath%>`
+                homePath: `<%=homePath%>`,
+                canRedactOnSpace: <%=canRedactOnSpace%>,
               }));
             </script>
           </div>
diff --git a/webapp/portlet/src/main/webapp/WEB-INF/portlet.xml b/webapp/portlet/src/main/webapp/WEB-INF/portlet.xml
index 9d78616dc51..fa185911221 100644
--- a/webapp/portlet/src/main/webapp/WEB-INF/portlet.xml
+++ b/webapp/portlet/src/main/webapp/WEB-INF/portlet.xml
@@ -498,7 +498,7 @@
     </init-param>
     <init-param>
       <name>layout-css-class</name>
-      <value>no-layout-style</value>
+      <value>no-layout-style full-height</value>
     </init-param>
     <supports>
       <mime-type>text/html</mime-type>
@@ -733,24 +733,10 @@
     <portlet-class>org.exoplatform.commons.api.portlet.GenericDispatchedViewPortlet</portlet-class>
     <init-param>
       <name>portlet-view-dispatched-file-path</name>
-      <value>/WEB-INF/jsp/portlet/spacesOverview.jsp</value>
-    </init-param>
-    <init-param>
-      <name>use-js-manager</name>
-      <value>true</value>
-    </init-param>
-    <init-param>
-      <name>js-manager-jsModule</name>
-      <value>PORTLET/social-portlet/SpacesOverview</value>
-    </init-param>
-    <init-param>
-      <name>prefetch.resources</name>
-      <value>true</value>
-    </init-param>
-    <init-param>
-      <name>prefetch.resource.rest</name>
-      <value><![CDATA[/portal/rest/v1/social/spaces?q=&offset=0&limit=0&filterType=manager&returnSize=true&expand=|/portal/rest/v1/social/spaces?q=&offset=0&limit=0&filterType=requests&returnSize=true&expand=pending|/portal/rest/v1/social/spaces?q=&offset=0&limit=0&filterType=pending&returnSize=true&expand=|/portal/rest/v1/social/spaces?q=&offset=0&limit=0&filterType=invited&returnSize=true&expand=]]></value>
+      <value>/html/spacesOverview.html</value>
     </init-param>
+    <expiration-cache>-1</expiration-cache>
+    <cache-scope>PUBLIC</cache-scope>
     <supports>
       <mime-type>text/html</mime-type>
     </supports>
diff --git a/webapp/portlet/src/main/webapp/WEB-INF/jsp/portlet/spacesOverview.jsp b/webapp/portlet/src/main/webapp/html/spacesOverview.html
similarity index 52%
rename from webapp/portlet/src/main/webapp/WEB-INF/jsp/portlet/spacesOverview.jsp
rename to webapp/portlet/src/main/webapp/html/spacesOverview.html
index eaa593061f9..282f272ed68 100644
--- a/webapp/portlet/src/main/webapp/WEB-INF/jsp/portlet/spacesOverview.jsp
+++ b/webapp/portlet/src/main/webapp/html/spacesOverview.html
@@ -2,5 +2,8 @@
   <div data-app="true"
     class="v-application v-application--is-ltr theme--light"
     id="SpacesOverview">
+    <script type="text/javascript">
+      window.require(["PORTLET/social-portlet/SpacesOverview"], app => app.init());
+    </script>
   </div>
 </div>
diff --git a/webapp/portlet/src/main/webapp/skin/less/common/SpaceCard/Style-mobile.less b/webapp/portlet/src/main/webapp/skin/less/common/SpaceCard/Style-mobile.less
deleted file mode 100644
index c9fa0efe498..00000000000
--- a/webapp/portlet/src/main/webapp/skin/less/common/SpaceCard/Style-mobile.less
+++ /dev/null
@@ -1,121 +0,0 @@
-/**
-
-  This file is part of the Meeds project (https://meeds.io/).
-
-  Copyright (C) 2020 - 2023 Meeds Association contact@meeds.io
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Lesser General Public
-  License as published by the Free Software Foundation; either
-  version 3 of the License, or (at your option) any later version.
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  Lesser General Public License for more details.
-  You should have received a copy of the GNU Lesser General Public License
-  along with this program; if not, write to the Free Software Foundation,
-  Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-*/
-
-.spaceCardFront, .spaceCardItem, .spaceCardFlip {
-  height: 72px;
-  max-height: 72px;
-  min-height: 72px;
-  margin-bottom: 5px;
-}
-
-.spaceAvatar {
-  position: absolute;
-  max-width: 60px;
-  margin: 6px 8px;
-
-  .v-image {
-    height: 60px !important;
-    max-height: 60px !important;
-    width: 60px !important;
-    max-width: 60px !important;
-  }
-}
-
-.spaceToolbarIcons {
-  width: 50px;
-  right: 3px;
-  margin: auto;
-  position: absolute;
-  padding: 0 !important;
-
-  .spaceActionIcon {
-    color: @btnColor !important;
-  }
-}
-
-.spaceCardActions {
-  float: right;
-  margin-top: 32px;
-  margin-right: 2px;
-
-  button {
-    border-radius: 50%;
-    padding: 0;
-    width: 26px;
-    height: 26px;
-    font-size: 12px;
-    width: 24px;
-    height: 24px;
-    font-size: 12px;
-
-    i {
-      margin-right: 0;
-    }
-  }
-}
-
-.spaceCardBody {
-  float: left;
-  left: 72px;
-  position: absolute;
-  width: ~"calc(100% - 105px)";
-  align-items: start !important;
-  text-align: left !important;
-  padding: 5px;
-
-  > * {
-    float: left;
-    padding: 0 !important;
-    clear: both;
-    max-width: 100%;
-    margin: 6px 5px 0;
-  }
-}
-
-.invitationButtons {
-  display: flex;
-
-  button {
-    max-width: none !important;
-    width: auto !important;
-    min-width: auto !important;
-  }
-
-  .refuseToJoinSpaceButton {
-    display: block !important;
-    margin-top: 0;
-    margin-left: 6px !important;
-  }
-
-  .acceptToJoinSpaceButtonParent {
-    .acceptToJoinSpaceButton {
-      border-radius: 50% !important;
-    }
-  }
-}
-
-.spaceBannerImg, .spaceInfoIcon, .spaceMenuIcon, .spaceButtonMenu, .spaceMembershipButton .spaceMembershipButtonText {
-  display: none !important;
-}
-
-.spaceEditIcon {
-  display: block !important;
-}
-
diff --git a/webapp/portlet/src/main/webapp/skin/less/common/SpaceCard/Style.less b/webapp/portlet/src/main/webapp/skin/less/common/SpaceCard/Style.less
deleted file mode 100644
index 8a8f498ad41..00000000000
--- a/webapp/portlet/src/main/webapp/skin/less/common/SpaceCard/Style.less
+++ /dev/null
@@ -1,198 +0,0 @@
-/**
-
-  This file is part of the Meeds project (https://meeds.io/).
-
-  Copyright (C) 2020 - 2023 Meeds Association contact@meeds.io
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Lesser General Public
-  License as published by the Free Software Foundation; either
-  version 3 of the License, or (at your option) any later version.
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  Lesser General Public License for more details.
-  You should have received a copy of the GNU Lesser General Public License
-  along with this program; if not, write to the Free Software Foundation,
-  Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-*/
-
-.spaceBannerImg {
-  position: absolute;
-}
-.spaceAvatar {
-  .v-image {
-    border-radius: 5px;
-    box-shadow: 0px 0px 0px -2px rgba(0, 0, 0, 0.1), 0px 0px 0px 1px rgba(0, 0, 0, 0.1), 0px 0px 0px 0px rgba(0, 0, 0, 0.1);
-  }
-  .v-image__image {
-    border-radius: 5px;
-  }
-}
-.joinSpaceButton:not(.skeleton-text), .acceptToJoinSpaceButton:not(.skeleton-text), .spaceButtonMenu:not(.skeleton-text) {
-  border: 1px solid @btnPrimaryBorder !important;
-  color: @btnPrimaryBorder !important;
-  i {
-    color: @btnPrimaryBorder !important;
-  }
-}
-.cancelRequestToJoinSpaceButton {
-  border: 1px solid @btnBorder !important;
-  color: @btnColor !important;
-
-  .v-btn__content {
-    max-width: 100%;
-    span {
-      width: auto;
-      max-width: calc( 100% - 28px );
-      min-width: auto;
-      display: inline-block !important;
-      overflow: hidden !important;
-      text-overflow: ellipsis !important;
-    }
-  }
-}
-.leaveSpaceButton, .refuseToJoinSpaceButton {
-  border: 1px solid @errorColor !important;
-  color: @errorColor !important;
-
-  .v-btn__content {
-    max-width: 100%;
-    span {
-      width: auto;
-      max-width: calc( 100% - 28px );
-      min-width: auto;
-      display: inline-block !important;
-      overflow: hidden !important;
-      text-overflow: ellipsis !important;
-    }
-  }
-}
-.refuseToJoinSpaceButton {
-  margin-top: 2px;
-}
-.spaceMenuIcon {
-  height: 26px !important;
-  width: 26px !important;
-  margin-top: 6px;
-
-  &:not(.skeleton-text) {
-    color: #fff !important;
-    background: @btnPrimaryDisableBackground !important;
-  }
-}
-.spaceInfoIcon {
-  height: 26px;
-  width: 26px;
-  margin-top: 6px;
-  
-  &:not(.skeleton-text) {
-    background: #fff;
-    border: 1px solid @infoBorder !important;
-    color: @infoBorder !important;
-  }
-}
-.spaceToolbarIcons {
-  display: flex;
-}
-.spaceActionMenu {
-  right: 21px ~'; /** orientation=lt */ ';
-  left: auto ~'!important; /** orientation=lt */ ';
-  left: 21px ~'; /** orientation=rt */ ';
-  right: auto ~'!important; /** orientation=rt */ ';
-  top: 42px !important;
-}
-.spaceCardFlipped {
-  transform: rotateY(180deg);
-}
-.spaceCardFlip {
-  transition: 0.6s;
-  transform-style: preserve-3d;
-  position: relative;
-  min-height: @spaceCardParentMaxHeight;
-  padding: 0;
-}
-.spaceCardFront, .spaceCardBack {
-  backface-visibility: hidden;
-  position: absolute;
-  top: 0;
-  left: 0 ~'; /** orientation=lt */ ';
-  right: 0 ~'; /** orientation=rt */ ';
-  height: @spaceCardMaxHeight;
-  max-height: @spaceCardMaxHeight;
-  width: 100%;
-  max-width: 100%;
-}
-.spaceCardFront {
-  z-index: 2;
-  transform: rotateY(0deg);
-}
-.spaceCardBack {
-  transform: rotateY(180deg);
-}
-.spaceCardItem {
-  height: @spaceCardMaxHeight;
-  max-height: @spaceCardMaxHeight;
-  flex-direction: column;
-  border-radius: 5px;
-}
-.spaceDisplayName {
-  color: @textColor !important;
-}
-.spaceMembersLabel {
-  color: @greyColorLighten1 !important;
-}
-.spaceCardActions {
-  align-items: flex-end !important;
-  button i {
-    margin-right: 10px ~'; /** orientation=lt */ ';
-    margin-left: 10px ~'; /** orientation=rt */ ';
-  }
-}
-.joinSpaceDisabledLabel, .invitationButtons {
-  width:100%;
-}
-.acceptToJoinSpaceButtonParent {
-  white-space: nowrap;
-  .acceptToJoinSpaceButton {
-    max-width: 85%;
-    width: 85%;
-    border-right: 0 ~'; /** orientation=lt */ ';
-    border-bottom-right-radius: 0  ~'!important; /** orientation=lt */ ';
-    border-top-right-radius: 0 ~'!important; /** orientation=lt */ ';
-    border-left: 0 ~'; /** orientation=rt */ ';
-    border-bottom-left-radius: 0  ~'!important; /** orientation=rt */ ';
-    border-top-left-radius: 0 ~'!important; /** orientation=rt */ ';
-
-    .v-btn__content {
-      max-width: 100%;
-      span {
-        width: auto;
-        max-width: calc( 100% - 28px );
-        min-width: auto;
-        display: inline-block !important;
-        overflow: hidden !important;
-        text-overflow: ellipsis !important;
-      }
-    }
-  }
-  .spaceButtonMenu {
-    max-width: 15%;
-    width: 15%;
-    padding: 5px 20px;
-    height: auto;
-    border-left: 0 ~'; /** orientation=lt */ ';
-    margin-left: -11px ~'; /** orientation=lt */ ';
-    border-bottom-left-radius: 0 ~'!important; /** orientation=lt */ ';
-    border-top-left-radius: 0 ~'!important; /** orientation=lt */ ';
-    border-right: 0 ~'; /** orientation=rt */ ';
-    margin-right: -11px ~'; /** orientation=rt */ ';
-    border-bottom-right-radius: 0 ~'!important; /** orientation=rt */ ';
-    border-top-right-radius: 0 ~'!important; /** orientation=rt */ ';
-
-    i {
-      margin: 0;
-    }
-  }
-}
diff --git a/webapp/portlet/src/main/webapp/skin/less/portlet/SpaceSearch/Style.less b/webapp/portlet/src/main/webapp/skin/less/portlet/SpaceSearch/Style.less
deleted file mode 100644
index 005db257b68..00000000000
--- a/webapp/portlet/src/main/webapp/skin/less/portlet/SpaceSearch/Style.less
+++ /dev/null
@@ -1,34 +0,0 @@
-/**
-
-  This file is part of the Meeds project (https://meeds.io/).
-
-  Copyright (C) 2020 - 2023 Meeds Association contact@meeds.io
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Lesser General Public
-  License as published by the Free Software Foundation; either
-  version 3 of the License, or (at your option) any later version.
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  Lesser General Public License for more details.
-  You should have received a copy of the GNU Lesser General Public License
-  along with this program; if not, write to the Free Software Foundation,
-  Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-*/
-
-@import "../../variables.less"; 
-@import "../../mixins.less";
-
-@spaceCardParentMargin: 22px;
-@spaceCardMaxHeight: 227px;
-@spaceCardParentMaxHeight: @spaceCardParentMargin + @spaceCardMaxHeight;
-
-.searchCard {
-  @import "../../common/SpaceCard/Style.less";
-
-  .btn {
-    box-sizing: border-box;
-  }
-}
diff --git a/webapp/portlet/src/main/webapp/skin/less/portlet/SpaceSettings/Style.less b/webapp/portlet/src/main/webapp/skin/less/portlet/SpaceSettings/Style.less
deleted file mode 100644
index d02801a9331..00000000000
--- a/webapp/portlet/src/main/webapp/skin/less/portlet/SpaceSettings/Style.less
+++ /dev/null
@@ -1,69 +0,0 @@
-/**
-
-  This file is part of the Meeds project (https://meeds.io/).
-
-  Copyright (C) 2020 - 2023 Meeds Association contact@meeds.io
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Lesser General Public
-  License as published by the Free Software Foundation; either
-  version 3 of the License, or (at your option) any later version.
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  Lesser General Public License for more details.
-  You should have received a copy of the GNU Lesser General Public License
-  along with this program; if not, write to the Free Software Foundation,
-  Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-*/
-
-@import "../../variables.less"; 
-@import "../../mixins.less";
-
-#SpaceSettings {
-  .v-alert.error {
-    position: absolute;
-    top: 80px;
-    left: ~"calc(260px - 50%)";
-  }
-}
-
-.spaceAvatarHoverEdit {
-  position: relative !important;
-  background: linear-gradient(180deg, rgb(255, 255, 255) 0%, rgb(4, 4, 4) 80%, rgba(0,0,0,1) 100%);
-
-  .v-image__image {
-    opacity: 0.8;
-  }
-  
-  .changeAvatarButton {
-    bottom: 0;
-    left: 50%;
-    transform: translateX(-50%);
-    position: absolute;
-    padding: 0;
-    margin: 0;
-    display: inline;
-
-    .v-input__prepend-outer {
-      margin: 0;
-
-      button {
-        background: rgba(0, 0, 0, 0.2) !important;
-        padding: 3px;
-        color: #fff;
-        border: 1px solid #fff !important;
-        border-radius: 50%;
-        height: 30px;
-        width: 30px;
-      }
-    }
-
-    .v-input__control {
-      visibility: hidden;
-      width: 0;
-      height: 0;
-    }
-  }
-}
diff --git a/webapp/portlet/src/main/webapp/skin/less/portlet/SpacesList/Style.less b/webapp/portlet/src/main/webapp/skin/less/portlet/SpacesList/Style.less
deleted file mode 100644
index 7d871819a34..00000000000
--- a/webapp/portlet/src/main/webapp/skin/less/portlet/SpacesList/Style.less
+++ /dev/null
@@ -1,90 +0,0 @@
-/**
-
-  This file is part of the Meeds project (https://meeds.io/).
-
-  Copyright (C) 2020 - 2023 Meeds Association contact@meeds.io
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Lesser General Public
-  License as published by the Free Software Foundation; either
-  version 3 of the License, or (at your option) any later version.
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  Lesser General Public License for more details.
-  You should have received a copy of the GNU Lesser General Public License
-  along with this program; if not, write to the Free Software Foundation,
-  Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-*/
-
-@import "../../variables.less"; 
-@import "../../mixins.less";
-
-@spaceCardParentMargin: 22px;
-@spaceCardMaxHeight: 227px;
-@spaceCardParentMaxHeight: @spaceCardParentMargin + @spaceCardMaxHeight;
-
-#spacesListApplication {
-  .selectSpacesFilter {
-    height: 40px;
-    width: auto;
-    padding-right: 20px;
-  }
-  #spacesListBody {
-    min-height: ~"calc(var(--100vh, 100vh) - 180px)";
-  }
-  .noSpacesYetBlock {
-    min-height: ~"calc(var(--100vh, 100vh) - 280px)";
-    color: @greyColorLighten1;
-
-    .addNewSpaceLink {
-      padding-bottom: 3px;
-    }
-    .noSpacesYetIcons {
-      direction: ltr;
-      i::before {
-        font-size: 140px !important;
-        color: @greyColorLighten1;
-      }
-    }
-  }
-  .inputSpacesFilter {
-    max-width: 215px;
-  }
-
-  .spaceFormDrawer {
-    textarea {
-      resize: none;
-    }
-  }
-  @import "../../common/SpaceCard/Style.less";
-
-  .spaceCardFront, .spaceCardBack {
-    > * {
-      margin: 0 5px;
-    }
-  }
-}
-
-@media (max-width: @maxMobileWidth) {
-  #spacesListApplication {
-    #spacesListToolbar {
-      .addNewSpaceButton {
-        padding: 0 !important;
-      }
-    }
-
-    .inputSpacesFilter {
-      .v-input__prepend-inner {
-        display: none;
-      }
-
-      input{
-        padding-top: 0;
-      }
-    }
-
-    @import "../../common/SpaceCard/Style-mobile.less";
-  }
-}
diff --git a/webapp/portlet/src/main/webapp/skin/less/portlet/WhoIsOnLine/Style.less b/webapp/portlet/src/main/webapp/skin/less/portlet/WhoIsOnLine/Style.less
deleted file mode 100644
index c460728f893..00000000000
--- a/webapp/portlet/src/main/webapp/skin/less/portlet/WhoIsOnLine/Style.less
+++ /dev/null
@@ -1,62 +0,0 @@
-/**
-
-  This file is part of the Meeds project (https://meeds.io/).
-
-  Copyright (C) 2020 - 2023 Meeds Association contact@meeds.io
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Lesser General Public
-  License as published by the Free Software Foundation; either
-  version 3 of the License, or (at your option) any later version.
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  Lesser General Public License for more details.
-  You should have received a copy of the GNU Lesser General Public License
-  along with this program; if not, write to the Free Software Foundation,
-  Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-*/
-
-@import "../../variables.less"; 
-@import "../../mixins.less";
-
-.onlineHeader {
-    background: @primaryBackgroundLight;
-    border: 1px solid @primaryBackgroundHover;
-    border-radius: @borderRadiusSmall;
-    color: @textColor;
-    line-height: 25px;
-    padding: 0 5px 0 8px;
-    font-weight: bold;
-    margin-bottom: 5px;
-}
-#OnlinePortlet {
-    #onlineContent {
-        box-shadow : none;
-        border: none;
-        border-radius: 0;
-        .title {
-            padding: 12px;
-            font-size: 1rem!important;
-            font-weight: 400;
-            letter-spacing: .03125em!important;
-            line-height: 1.5rem;
-            text-transform: uppercase;
-            color: @greyColorLighten1;
-        }
-        ul {
-            list-style-type: none;
-            text-align: center;
-            padding: 10px 0 10px 0;
-
-         }
-        .gallery li {
-            display: inline;
-            list-style: none;
-            text-align: center;
-            height: 40px;
-            width: 30px;
-        }
-	}
-}
diff --git a/webapp/portlet/src/main/webapp/vue-apps/application-toolbar/components/ApplicationToolbar.vue b/webapp/portlet/src/main/webapp/vue-apps/application-toolbar/components/ApplicationToolbar.vue
index 2b7f21dd430..35ffc5cf36b 100644
--- a/webapp/portlet/src/main/webapp/vue-apps/application-toolbar/components/ApplicationToolbar.vue
+++ b/webapp/portlet/src/main/webapp/vue-apps/application-toolbar/components/ApplicationToolbar.vue
@@ -162,16 +162,16 @@
             v-if="showFilterButton"
             id="applicationToolbarAdvancedFilterButton"
             :class="filterButtonClass"
-            :small="isCompact"
+            :small="!showRightFilterButtonText"
             text
             @click="$emit('filter-button-click', $event)">
             <v-icon
-              :size="isCompact && 24 || 16"
+              :size="showRightFilterButtonText && 16 || 24"
               :class="filtersCount && 'primary--text' || 'icon-default-color'">
               fa-sliders-h
             </v-icon>
             <span
-              v-if="!isCompact"
+              v-if="showRightFilterButtonText"
               class="ms-2">
               {{ rightFilterButton.text }}
             </span>
@@ -282,6 +282,7 @@ export default {
       default: () => ({
         hide: true,
         text: null,
+        displayText: null, // Force to display text even in compact mode
       }),
     },
     filtersCount: { // Filter button: applied filter count
@@ -335,6 +336,9 @@ export default {
     showLeftContent() {
       return !this.hideLeft && !this.expandFilter && (!this.isCompact || this.hasLeftContent || (this.hasCenterContent && this.hasRightContent));
     },
+    showRightFilterButtonText() {
+      return !this.isCompact || this.rightFilterButton?.displayText;
+    },
     hasCenterButtonToggle() {
       return this.centerButtonToggle
           && !this.centerButtonToggle?.hide
@@ -396,7 +400,7 @@ export default {
       return this.hasButtonFilter && !this.hideRightInputs;
     },
     filterButtonClass() {
-      return `${this.isCompact && 'width-auto ms-4 px-0' || 'ms-4 px-2'} ${this.filtersCount && 'primary--text' || ''} ${!this.isCompact && (this.filtersCount && 'primary-border-color' || 'border-color') || ''}`;
+      return `${!this.showRightFilterButtonText && 'width-auto ms-4 px-0' || 'ms-4 px-2'} ${this.filtersCount && 'primary--text' || ''} ${this.showRightFilterButtonText && (this.filtersCount && 'primary-border-color' || 'border-color') || ''}`;
     },
     hasRightContent() {
       return this.rightInputsCount > 0;
@@ -480,6 +484,7 @@ export default {
     }
   },
   beforeDestroy() {
+    this.$root.$off('reset-filter', this.reset);
     document.removeEventListener('keydown', this.clearSearch);
     document.removeEventListener('keydown', this.closeFilter);
   },
diff --git a/webapp/portlet/src/main/webapp/vue-apps/common/components/ExtensionRegistryComponents.vue b/webapp/portlet/src/main/webapp/vue-apps/common/components/ExtensionRegistryComponents.vue
index c6d55bd906a..8e9cd8a2d2b 100644
--- a/webapp/portlet/src/main/webapp/vue-apps/common/components/ExtensionRegistryComponents.vue
+++ b/webapp/portlet/src/main/webapp/vue-apps/common/components/ExtensionRegistryComponents.vue
@@ -137,16 +137,7 @@ export default {
     },
   },
   created() {
-    document.addEventListener(`component-${this.name}-${this.type}-updated`, event => {
-      const component = event && event.detail;
-      if (component) {
-        if (!this.strictType || component.componentName === this.type) {
-          const components = this.components.slice();
-          this.registerComponent(component, components);
-          this.components = components;
-        }
-      }
-    });
+    document.addEventListener(`component-${this.name}-${this.type}-updated`, this.updateComponents);
     const registeredComponents = extensionRegistry.loadComponents(this.name);
     const components = [];
     if (this.strictType) {
@@ -160,7 +151,20 @@ export default {
     }
     this.components = components;
   },
+  beforeDestroy() {
+    document.removeEventListener(`component-${this.name}-${this.type}-updated`, this.updateComponents);
+  },
   methods: {
+    updateComponents(event) {
+      const component = event && event.detail;
+      if (component) {
+        if (!this.strictType || component.componentName === this.type) {
+          const components = this.components.slice();
+          this.registerComponent(component, components);
+          this.components = components;
+        }
+      }
+    },
     registerComponent(component, components) {
       if (component.componentOptions.init) {
         const initResult = component.componentOptions.init(this.params);
diff --git a/webapp/portlet/src/main/webapp/vue-apps/common/components/FavoriteButton.vue b/webapp/portlet/src/main/webapp/vue-apps/common/components/FavoriteButton.vue
index 8bd0999b02f..a2cce890583 100644
--- a/webapp/portlet/src/main/webapp/vue-apps/common/components/FavoriteButton.vue
+++ b/webapp/portlet/src/main/webapp/vue-apps/common/components/FavoriteButton.vue
@@ -1,6 +1,5 @@
 <template>
-  <div
-    :class="!displayLabel && 'd-inline-flex'">
+  <div :class="!displayLabel && 'd-inline-flex'">
     <v-tooltip bottom>
       <template v-if="!displayLabel" #activator="{ on, attrs }">
         <v-btn
@@ -14,12 +13,16 @@
           :small="small"
           v-bind="attrs"
           v-on="on"
-          @click="changeFavorite">
+          @touchstart.stop="0"
+          @touchend.stop="0"
+          @mousedown.stop="0"
+          @mouseup.stop="0"
+          @click.stop.prevent="changeFavorite">
           <div class="d-flex flex-lg-row flex-column">
             <v-icon
-              class="mx-auto"
               :class="favoriteIconColor"
-              size="16">
+              :size="iconSize"
+              class="mx-auto">
               {{ favoriteIcon }}
             </v-icon>
           </div>
@@ -30,7 +33,7 @@
           v-bind="attrs" 
           v-on="on" 
           :aria-label="favoriteTooltip"
-          @click="changeFavorite">
+          @click.stop.prevent="changeFavorite">
           <v-icon 
             class="mr-3"
             :class="favoriteIconColor"
@@ -101,7 +104,11 @@ export default {
     extraClass: {
       type: String,
       default: () => '',
-    }
+    },
+    iconSize: {
+      type: Number,
+      default: () => 16,
+    },
   },
   data: () => ({
     isFavorite: false,
@@ -159,11 +166,7 @@ export default {
         favorite: this.isFavorite,
       }}));
     },
-    changeFavorite(event) {
-      if (event) {
-        event.stopPropagation();
-        event.preventDefault();
-      }
+    changeFavorite() {
       this.loading = true;
       if (this.isFavorite) {
         this.$favoriteService.removeFavorite(this.type, this.id)
diff --git a/webapp/portlet/src/main/webapp/vue-apps/common/components/RippleHoverButton.vue b/webapp/portlet/src/main/webapp/vue-apps/common/components/RippleHoverButton.vue
index 5a861876543..147da2dda7b 100644
--- a/webapp/portlet/src/main/webapp/vue-apps/common/components/RippleHoverButton.vue
+++ b/webapp/portlet/src/main/webapp/vue-apps/common/components/RippleHoverButton.vue
@@ -24,8 +24,8 @@
     :ripple="!ripple"
     :text="text"
     :icon="icon"
-    @mousedown.stop.prevent="nop"
-    @touchstart.stop.prevent="nop"
+    @mousedown.stop.prevent="0"
+    @touchstart.stop.prevent="0"
     @touchend.stop.prevent="emitAction($event, false)"
     @click.stop.prevent="emitAction($event, false)"
     @mouseover.stop.prevent="emitAction($event, true)">
@@ -61,12 +61,6 @@ export default {
     },
   },
   methods: {
-    nop(event) {
-      if (event) {
-        event.preventDefault();
-        event.stopPropagation();
-      }
-    },
     emitAction(event, mouseover) {
       if (!this.active && mouseover) {
         return;
diff --git a/webapp/portlet/src/main/webapp/vue-apps/common/components/SpaceAvatar.vue b/webapp/portlet/src/main/webapp/vue-apps/common/components/SpaceAvatar.vue
index 6d041ba9be4..bd77001faed 100644
--- a/webapp/portlet/src/main/webapp/vue-apps/common/components/SpaceAvatar.vue
+++ b/webapp/portlet/src/main/webapp/vue-apps/common/components/SpaceAvatar.vue
@@ -190,11 +190,10 @@ export default {
       return this.space?.avatarUrl || (this.prettyName && `${eXo.env.portal.context}/${eXo.env.portal.rest}/v1/social/spaces/${this.prettyName}/avatar`);
     },
     url() {
-      if (!this.groupId) {
+      if (!this.space?.id) {
         return '#';
       }
-      const uri = this.groupId.replace(/\//g, ':');
-      return `${eXo.env.portal.context}/g/${uri}/`;
+      return `${eXo.env.portal.context}/s/${this.space?.id}`;
     },
     spaceMembersCount() {
       return this.space && this.space.membersCount;
diff --git a/webapp/portlet/src/main/webapp/vue-apps/component-image-crop/components/ImageCropDrawer.vue b/webapp/portlet/src/main/webapp/vue-apps/component-image-crop/components/ImageCropDrawer.vue
index 01b906da99e..7a86f471321 100644
--- a/webapp/portlet/src/main/webapp/vue-apps/component-image-crop/components/ImageCropDrawer.vue
+++ b/webapp/portlet/src/main/webapp/vue-apps/component-image-crop/components/ImageCropDrawer.vue
@@ -51,7 +51,7 @@
               :max-height="height"
               :max-width="maxWidth"
               :class="circle && 'cropper-circle' || rounded && 'cropper-rounded'"
-              class="border-color mx-auto primary position-relative"
+              class="border-color mx-auto primary position-relative overflow-hidden"
               flat>
               <img
                 v-if="imageData && !isImageGif"
@@ -146,7 +146,7 @@
                   icon
                   outlined
                   @click="zoom -= stepZoom">
-                  <v-icon size="18">fas fa-isImageGifsearch-minus</v-icon>
+                  <v-icon size="18">fas fa-minus</v-icon>
                 </v-btn>
                 <v-slider
                   v-model="zoom"
diff --git a/webapp/portlet/src/main/webapp/vue-apps/hamburger-menu/components/recent-spaces/SpacePanelHamburgerNavigation.vue b/webapp/portlet/src/main/webapp/vue-apps/hamburger-menu/components/recent-spaces/SpacePanelHamburgerNavigation.vue
index 88b1e32cfb5..6e58ba25eb1 100644
--- a/webapp/portlet/src/main/webapp/vue-apps/hamburger-menu/components/recent-spaces/SpacePanelHamburgerNavigation.vue
+++ b/webapp/portlet/src/main/webapp/vue-apps/hamburger-menu/components/recent-spaces/SpacePanelHamburgerNavigation.vue
@@ -124,7 +124,7 @@
           :space-id="spaceId"
           :muted="muted"
           origin="spaceLeftNavigationAction" />
-        <exo-space-favorite-action
+        <space-favorite-action
           :is-favorite="isFavorite"
           :space-id="spaceId"
           entity-type="spaces_left_navigation" />
diff --git a/webapp/portlet/src/main/webapp/vue-apps/organizational-chart/components/view/ChartUserCompactCard.vue b/webapp/portlet/src/main/webapp/vue-apps/organizational-chart/components/view/ChartUserCompactCard.vue
index 1fa609b56dd..e17df69725b 100644
--- a/webapp/portlet/src/main/webapp/vue-apps/organizational-chart/components/view/ChartUserCompactCard.vue
+++ b/webapp/portlet/src/main/webapp/vue-apps/organizational-chart/components/view/ChartUserCompactCard.vue
@@ -23,7 +23,7 @@
     v-slot="{ hover }">
     <v-card
       :class="hover && 'elevation-2'"
-      class="mx-auto d-flex flex-column border-box-sizing card-border-radius chartCompactUserCard"
+      class="mx-auto d-flex flex-column border-box-sizing chartCompactUserCard"
       width="268"
       height="85"
       outlined
diff --git a/webapp/portlet/src/main/webapp/vue-apps/people-list/components/PeopleAdvancedFilterDrawer.vue b/webapp/portlet/src/main/webapp/vue-apps/people-list/components/PeopleAdvancedFilterDrawer.vue
index f45a866a3c6..4273c8294e7 100644
--- a/webapp/portlet/src/main/webapp/vue-apps/people-list/components/PeopleAdvancedFilterDrawer.vue
+++ b/webapp/portlet/src/main/webapp/vue-apps/people-list/components/PeopleAdvancedFilterDrawer.vue
@@ -1,21 +1,24 @@
-/*
- * This file is part of the Meeds project (https://meeds.io/).
+<!--
 
- * Copyright (C) 2023 Meeds Association contact@meeds.io
+  This file is part of the Meeds project (https://meeds.io/).
 
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
+  Copyright (C) 2020 - 2024 Meeds Association contact@meeds.io
 
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-*/
+  This program is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 3 of the License, or (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public License
+  along with this program; if not, write to the Free Software Foundation,
+  Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+-->
 <template>
   <exo-drawer
     ref="peopleAdvancedFilterDrawer"
diff --git a/webapp/portlet/src/main/webapp/vue-apps/people-list/components/PeopleToolbar.vue b/webapp/portlet/src/main/webapp/vue-apps/people-list/components/PeopleToolbar.vue
index 0ffe6e70097..5e5f9620eb4 100644
--- a/webapp/portlet/src/main/webapp/vue-apps/people-list/components/PeopleToolbar.vue
+++ b/webapp/portlet/src/main/webapp/vue-apps/people-list/components/PeopleToolbar.vue
@@ -1,23 +1,24 @@
 <!--
- * This file is part of the Meeds project (https://meeds.io/).
- *
- * Copyright (C) 2024 Meeds Association contact@meeds.io
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- -->
 
+ This file is part of the Meeds project (https://meeds.io/).
+
+ Copyright (C) 2024 Meeds Association contact@meeds.io
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 3 of the License, or (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public License
+ along with this program; if not, write to the Free Software Foundation,
+ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+-->
 <template>
   <application-toolbar
     id="peopleListApplication"
@@ -51,9 +52,7 @@
     </template>
   </application-toolbar>
 </template>
-
 <script>
-
 export default {
   props: {
     filter: {
diff --git a/webapp/portlet/src/main/webapp/vue-apps/people-list/components/usercard/PeopleUserCard.vue b/webapp/portlet/src/main/webapp/vue-apps/people-list/components/usercard/PeopleUserCard.vue
index d7e44e585ea..3c3b92c686b 100644
--- a/webapp/portlet/src/main/webapp/vue-apps/people-list/components/usercard/PeopleUserCard.vue
+++ b/webapp/portlet/src/main/webapp/vue-apps/people-list/components/usercard/PeopleUserCard.vue
@@ -25,7 +25,7 @@
       :width="$attrs.width"
       :min-width="$attrs.minWidth"
       :href="profileUrl"
-      class="mx-auto border-box-sizing card-border-radius socialUserCard"
+      class="mx-auto border-box-sizing socialUserCard"
       height="227"
       outlined>
       <v-img
@@ -92,7 +92,11 @@
             :key="extension.id"
             :title="extension.title || $t(extension.titleKey)"
             icon
-            @click.prevent="extension.click(user)">
+            @touchstart.stop="0"
+            @touchend.stop="0"
+            @mousedown.stop="0"
+            @mouseup.stop="0"
+            @click.stop.prevent="extension.click(user)">
             <v-card
               class="d-flex align-center justify-center transparent"
               height="25"
@@ -114,7 +118,11 @@
               v-if="!extension.init"
               :aria-label="extension.title || $t(extension.titleKey)"
               icon
-              @click.prevent="extension.click(user)">
+              @touchstart.stop="0"
+              @touchend.stop="0"
+              @mousedown.stop="0"
+              @mouseup.stop="0"
+              @click.stop.prevent="extension.click(user)">
               <v-icon
                 :title="extension.title || $t(extension.titleKey)"
                 size="20">
diff --git a/webapp/portlet/src/main/webapp/vue-apps/popover/components/PopoverMenu.vue b/webapp/portlet/src/main/webapp/vue-apps/popover/components/PopoverMenu.vue
index bd18750f789..8d4b9825f22 100644
--- a/webapp/portlet/src/main/webapp/vue-apps/popover/components/PopoverMenu.vue
+++ b/webapp/portlet/src/main/webapp/vue-apps/popover/components/PopoverMenu.vue
@@ -62,10 +62,10 @@ export default {
   },
   computed: {
     isUserIdentity() {
-      return this.identityType && this.identityType === 'User';
+      return this.identityType?.toLowerCase?.() === 'user';
     },
     isSpaceIdentity() {
-      return this.identityType && this.identityType === 'Space';
+      return this.identityType?.toLowerCase?.() === 'space';
     },
   },
   watch: {
diff --git a/webapp/portlet/src/main/webapp/vue-apps/popover/components/SpacePopoverContent.vue b/webapp/portlet/src/main/webapp/vue-apps/popover/components/SpacePopoverContent.vue
index 59a3bf98f71..6ea62782102 100644
--- a/webapp/portlet/src/main/webapp/vue-apps/popover/components/SpacePopoverContent.vue
+++ b/webapp/portlet/src/main/webapp/vue-apps/popover/components/SpacePopoverContent.vue
@@ -21,7 +21,7 @@
 <template>
   <v-card
     elevation="2"
-    class="pa-2 card-border-radius"
+    class="pa-2 space-popover card-border-radius"
     max-width="250"
     min-width="250"
     id="identity-popover"
@@ -46,16 +46,16 @@
         <p
           v-if="spaceDescription"
           v-sanitized-html="spaceDescription"
-          class="text-truncate-2 text-caption text--primary font-weight-medium"></p>
+          class="text-truncate-2 text-caption text--primary font-weight-medium mt-2"></p>
       </v-list-item-content>
     </v-list-item>
     <div class="d-flex justify-end">
       <space-mute-notification-button
         :space-id="spaceId"
-        :muted="space?.isMuted === 'true'"
+        :muted="isSpaceMuted"
         origin="spacePopoverAction" />
-      <exo-space-favorite-action
-        v-if="favoriteActionEnabled"
+      <space-favorite-action
+        v-if="isSpaceMember"
         :key="space.id"
         :is-favorite="space.isFavorite"
         :space-id="space.id" />
@@ -76,9 +76,7 @@
     </div>
   </v-card>
 </template>
-
 <script>
-
 export default {
   props: {
     space: {
@@ -86,11 +84,10 @@ export default {
       default: null,
     },
   },
-  data() {
-    return {
-      externalExtensions: [],
-    };
-  },
+  data: () => ({
+    retrievedSpace: null,
+    externalExtensions: [],
+  }),
   computed: {
     enabledExtensionComponents() {
       return this.externalExtensions.filter(extension => extension.enabled);
@@ -98,21 +95,32 @@ export default {
     spaceId() {
       return this.space?.id;
     },
+    spacePrettyName() {
+      return this.space?.prettyName;
+    },
     spaceMembersCount() {
-      return this.space?.membersCount;
+      return this.space?.membersCount || this.retrievedSpace?.membersCount;
     },
     spaceDescription() {
-      return this.space?.description;
+      return this.space?.description || this.retrievedSpace?.description;
+    },
+    isSpaceMember() {
+      return this.space?.isMember || this.retrievedSpace?.isMember;
+    },
+    isSpaceMuted() {
+      return this.space?.isMuted === 'true' || this.retrievedSpace?.isMuted === 'true';
+    },
+    canRedactOnSpace() {
+      return this.retrievedSpace ? this.retrievedSpace?.canRedactOnSpace : this.space?.canRedactOnSpace;
     },
     params() {
       return {
         identityType: 'space',
         identityId: this.spaceId,
+        spacePrettyName: this.spacePrettyName,
+        canRedactOnSpace: this.canRedactOnSpace,
       };
     },
-    favoriteActionEnabled() {
-      return this.space?.isMember;
-    }
   },
   watch: {
     spaceId: {
@@ -124,7 +132,15 @@ export default {
       },
     },
   },
+  created() {
+    this.init();
+  },
   methods: {
+    async init() {
+      if (this.spaceId && !Object.hasOwn(this.space, 'membersCount')) {
+        this.retrievedSpace = await this.$spaceService.getSpaceById(this.spaceId, 'favorite');
+      }
+    },
     refreshExtensions() {
       this.externalExtensions = [];
       this.$nextTick(() => {
diff --git a/webapp/portlet/src/main/webapp/vue-apps/popover/components/UserPopoverContent.vue b/webapp/portlet/src/main/webapp/vue-apps/popover/components/UserPopoverContent.vue
index 278aaf26165..217153531fd 100644
--- a/webapp/portlet/src/main/webapp/vue-apps/popover/components/UserPopoverContent.vue
+++ b/webapp/portlet/src/main/webapp/vue-apps/popover/components/UserPopoverContent.vue
@@ -98,9 +98,9 @@ export default {
     params() {
       return {
         identityType: 'USER_TIPTIP',
-        identityId: this.identity && this.identity.username,
-        identityEnabled: this.identity && this.identity.enabled,
-        identityDeleted: this.identity && this.identity.deleted,
+        identityId: this.identity?.username,
+        identityEnabled: this.identity?.enabled,
+        identityDeleted: this.identity?.deleted,
       };
     },
     enabledExtensionComponents() {
diff --git a/webapp/portlet/src/main/webapp/vue-apps/popover/initComponents.js b/webapp/portlet/src/main/webapp/vue-apps/popover/initComponents.js
index 5fd351a976e..fa35666c1cf 100644
--- a/webapp/portlet/src/main/webapp/vue-apps/popover/initComponents.js
+++ b/webapp/portlet/src/main/webapp/vue-apps/popover/initComponents.js
@@ -4,7 +4,7 @@ import UserPopoverContent from './components/UserPopoverContent.vue';
 import SpacePopoverContent from './components/SpacePopoverContent.vue';
 import SpaceMuteNotificationButton from './components/SpaceMuteNotificationButton.vue';
 import UsersListDrawer from './components/UsersListDrawer.vue';
-import ExoSpaceFavoriteAction from '../spaces-list/components/ExoSpaceFavoriteAction.vue';
+import SpaceFavoriteAction from '../spaces-list/components/SpaceFavoriteAction.vue';
 
 const components = {
   'popover': Popover,
@@ -14,7 +14,7 @@ const components = {
   'space-mute-notification-button': SpaceMuteNotificationButton,
   'users-list-drawer': UsersListDrawer
 };
-components['exo-space-favorite-action'] = ExoSpaceFavoriteAction;
+components['space-favorite-action'] = SpaceFavoriteAction;
 
 for (const key in components) {
   Vue.component(key, components[key]);
diff --git a/webapp/portlet/src/main/webapp/vue-apps/search-space/components/SearchSpaceCard.vue b/webapp/portlet/src/main/webapp/vue-apps/search-space/components/SearchSpaceCard.vue
index 1ac44ac3c11..67d125b3283 100644
--- a/webapp/portlet/src/main/webapp/vue-apps/search-space/components/SearchSpaceCard.vue
+++ b/webapp/portlet/src/main/webapp/vue-apps/search-space/components/SearchSpaceCard.vue
@@ -1,13 +1,12 @@
 <template>
-  <div>
-    <exo-space-card
+  <div class="space-search-card">
+    <space-card
       :space="result"
-      :profile-action-extensions="profileActionExtensions"
+      :space-action-extensions="spaceActionExtensions"
       embedded
       @refresh="$emit('refresh')" />
   </div>
 </template>
-
 <script>
 export default {
   props: {
@@ -21,12 +20,19 @@ export default {
     },
   },
   data: () => ({
-    profileActionExtensions: [],
+    spaceActionExtensions: [],
   }),
   created() {
-    this.profileActionExtensions = extensionRegistry.loadExtensions('profile-extension', 'action') || [];
-    this.$root.$on('editSpace', space => document.dispatchEvent(new CustomEvent('editSpaceDetail', {'detail': space})));
-    this.$root.$on('displaySpaceManagers', space => document.dispatchEvent(new CustomEvent('openSpaceManagerDetail', {'detail': space})));
+    document.addEventListener('extension-profile-extension-action-updated', this.refreshExtensions);
+    this.refreshExtensions();
   },
+  beforeDestroy() {
+    document.removeEventListener('extension-profile-extension-action-updated', this.refreshExtensions);
+  },
+  methods: {
+    refreshExtensions() {
+      this.spaceActionExtensions = extensionRegistry.loadExtensions('profile-extension', 'action') || [];
+    },
+  }
 };
 </script>
diff --git a/webapp/portlet/src/main/webapp/vue-apps/search-space/components/SearchSpaceDrawers.vue b/webapp/portlet/src/main/webapp/vue-apps/search-space/components/SearchSpaceDrawers.vue
deleted file mode 100644
index 4287a1982f1..00000000000
--- a/webapp/portlet/src/main/webapp/vue-apps/search-space/components/SearchSpaceDrawers.vue
+++ /dev/null
@@ -1,25 +0,0 @@
-<template>
-  <div>
-    <exo-space-managers-drawer />
-    <exo-space-form-drawer />
-  </div>
-</template>
-
-<script>
-export default {
-  mounted() {
-    document.addEventListener('editSpaceDetail', this.editSpaceDetail);
-    document.addEventListener('openSpaceManagerDetail', this.openSpaceManagerDetail);
-  },
-  methods: {
-    editSpaceDetail(space) {
-      space = space.detail || space;
-      this.$root.$emit('editSpace', space);
-    },
-    openSpaceManagerDetail(space) {
-      space = space.detail || space;
-      this.$root.$emit('displaySpaceManagers', space);
-    },
-  }
-};
-</script>
diff --git a/webapp/portlet/src/main/webapp/vue-apps/search-space/initComponents.js b/webapp/portlet/src/main/webapp/vue-apps/search-space/initComponents.js
index 1e05034cfea..a64b25ec67f 100644
--- a/webapp/portlet/src/main/webapp/vue-apps/search-space/initComponents.js
+++ b/webapp/portlet/src/main/webapp/vue-apps/search-space/initComponents.js
@@ -1,9 +1,7 @@
 import SearchSpaceCard from './components/SearchSpaceCard.vue';
-import SearchSpaceDrawers from './components/SearchSpaceDrawers.vue';
 
 const components = {
   'space-search-result-card': SearchSpaceCard,
-  'space-search-drawers': SearchSpaceDrawers,
 };
 
 for (const key in components) {
diff --git a/webapp/portlet/src/main/webapp/vue-apps/search-space/main.js b/webapp/portlet/src/main/webapp/vue-apps/search-space/main.js
index e20293dd39e..b2ba3fcfa66 100644
--- a/webapp/portlet/src/main/webapp/vue-apps/search-space/main.js
+++ b/webapp/portlet/src/main/webapp/vue-apps/search-space/main.js
@@ -3,18 +3,3 @@ import './initComponents.js';
 export function formatSearchResult(result) {
   return result && result.spaces;
 }
-
-$('.VuetifyApp .v-application').first().append('<div id="SpaceSearchDrawers" />');
-
-const appId = 'SpaceSearchDrawers';
-
-const lang = typeof eXo !== 'undefined' ? eXo.env.portal.language : 'en';
-
-const urls = [`/social-portlet/i18n/locale.portlet.Portlets?lang=${lang}`];
-exoi18n.loadLanguageAsync(lang, urls).then(i18n => {
-  Vue.createApp({
-    template: '<space-search-drawers />',
-    vuetify: Vue.prototype.vuetifyOptions,
-    i18n,
-  }, `#${appId}`, 'Search Space Drawers');
-});
\ No newline at end of file
diff --git a/webapp/portlet/src/main/webapp/vue-apps/space-access/components/SpaceAccess.vue b/webapp/portlet/src/main/webapp/vue-apps/space-access/components/SpaceAccess.vue
index 52edd91f6ec..658d8b43db2 100644
--- a/webapp/portlet/src/main/webapp/vue-apps/space-access/components/SpaceAccess.vue
+++ b/webapp/portlet/src/main/webapp/vue-apps/space-access/components/SpaceAccess.vue
@@ -28,11 +28,11 @@
       </v-card-text>
       <v-card-text
         v-if="firstLabel"
-        class="text-color"
+        class="text-title"
         v-sanitized-html="firstLabel" />
       <v-card-text
         v-if="secondLabel"
-        class="text-subtitle"
+        class="text-body"
         v-sanitized-html="secondLabel" />
       <v-card-actions class="justify-center py-5">
         <template v-if="spaceAccessTypeLabel === 'INVITED_SPACE'">
diff --git a/webapp/portlet/src/main/webapp/vue-apps/space-top-bannerlogo/components/SpaceLogoBanner.vue b/webapp/portlet/src/main/webapp/vue-apps/space-top-bannerlogo/components/SpaceLogoBanner.vue
index 21a3ba1c296..692faec75fc 100644
--- a/webapp/portlet/src/main/webapp/vue-apps/space-top-bannerlogo/components/SpaceLogoBanner.vue
+++ b/webapp/portlet/src/main/webapp/vue-apps/space-top-bannerlogo/components/SpaceLogoBanner.vue
@@ -125,7 +125,7 @@
                 :space-id="spaceId"
                 :muted="muted"
                 origin="spaceTopbarpopoverAction" />
-              <exo-space-favorite-action
+              <space-favorite-action
                 :is-favorite="isFavorite"
                 :space-id="spaceId"
                 entity-type="SPACE_TOP_BAR_TIPTIP"
@@ -205,6 +205,10 @@ export default {
       type: Boolean,
       default: false
     },
+    canRedactOnSpace: {
+      type: Boolean,
+      default: false
+    },
   },
   data: () => ({
     menu: false,
@@ -220,7 +224,10 @@ export default {
     params() {
       return {
         identityType: 'space',
-        identityId: eXo.env.portal.spaceId
+        identityId: eXo.env.portal.spaceId,
+        identityEnabled: true,
+        identityDeleted: false,
+        canRedactOnSpace: this.canRedactOnSpace,
       };
     },
   },
diff --git a/webapp/portlet/src/main/webapp/vue-apps/space-top-bannerlogo/initComponents.js b/webapp/portlet/src/main/webapp/vue-apps/space-top-bannerlogo/initComponents.js
index 3799c090653..6f64ee2c0ac 100644
--- a/webapp/portlet/src/main/webapp/vue-apps/space-top-bannerlogo/initComponents.js
+++ b/webapp/portlet/src/main/webapp/vue-apps/space-top-bannerlogo/initComponents.js
@@ -1,14 +1,14 @@
 import SpaceLogoBanner from './components/SpaceLogoBanner.vue';
 import SpacePopoverActionComponents from './components/SpacePopoverActionComponents.vue';
 import SpaceHostsDrawer from './components/SpaceHostsDrawer.vue';
-import ExoSpaceFavoriteAction from '../spaces-list/components/ExoSpaceFavoriteAction.vue';
+import SpaceFavoriteAction from '../spaces-list/components/SpaceFavoriteAction.vue';
 
 
 const components = {
   'space-logo-banner': SpaceLogoBanner,
   'space-popover-action-component': SpacePopoverActionComponents,
   'space-hosts-drawer': SpaceHostsDrawer,
-  'exo-space-favorite-action': ExoSpaceFavoriteAction
+  'space-favorite-action': SpaceFavoriteAction
 };
 
 for (const key in components) {
diff --git a/webapp/portlet/src/main/webapp/vue-apps/space-top-bannerlogo/main.js b/webapp/portlet/src/main/webapp/vue-apps/space-top-bannerlogo/main.js
index 525e0b04efe..5f98b60b0ad 100644
--- a/webapp/portlet/src/main/webapp/vue-apps/space-top-bannerlogo/main.js
+++ b/webapp/portlet/src/main/webapp/vue-apps/space-top-bannerlogo/main.js
@@ -32,6 +32,7 @@ export function init(params) {
         spaceDescription: decodeURIComponent(params.spaceDescription || ''),
         managers: params.managers,
         homePath: params.homePath,
+        canRedactOnSpace: params.canRedactOnSpace,
       }),
       template: `<space-logo-banner
                    id="SpaceTopBannerLogo"
@@ -44,7 +45,9 @@ export function init(params) {
                    :members-number="membersNumber"
                    :managers="managers"
                    :home-path="homePath"
-                   :space-description="spaceDescription" />`,
+                   :space-description="spaceDescription"
+                   :can-redact-on-space="canRedactOnSpace"
+                   class="full-height" />`,
       created() {
         document.addEventListener('space-settings-updated', this.refreshSpaceSettings);
       },
diff --git a/webapp/portlet/src/main/webapp/vue-apps/spaces-list/components/ExoSpaceCard.vue b/webapp/portlet/src/main/webapp/vue-apps/spaces-list/components/ExoSpaceCard.vue
deleted file mode 100644
index cf87fd62f3b..00000000000
--- a/webapp/portlet/src/main/webapp/vue-apps/spaces-list/components/ExoSpaceCard.vue
+++ /dev/null
@@ -1,34 +0,0 @@
-<template>
-  <v-flex :class="flipCard && 'spaceCardFlip spaceCardFlipped' || 'spaceCardFlip'">
-    <div class="spaceCardFront">
-      <exo-space-card-front
-        :space="space"
-        :profile-action-extensions="profileActionExtensions"
-        front
-        @flip="flipCard = true"
-        @refresh="$emit('refresh')" />
-    </div>
-    <div class="spaceCardBack">
-      <exo-space-card-reverse
-        :space="space"
-        @flip="flipCard = false" />
-    </div>
-  </v-flex>
-</template>
-<script>
-export default {
-  props: {
-    space: {
-      type: Object,
-      default: () => ({}),
-    },
-    profileActionExtensions: {
-      type: Array,
-      default: () => [],
-    },
-  },
-  data: () => ({
-    flipCard: false,
-  }),
-};
-</script>
diff --git a/webapp/portlet/src/main/webapp/vue-apps/spaces-list/components/ExoSpaceCardFront.vue b/webapp/portlet/src/main/webapp/vue-apps/spaces-list/components/ExoSpaceCardFront.vue
deleted file mode 100644
index 393140ad16a..00000000000
--- a/webapp/portlet/src/main/webapp/vue-apps/spaces-list/components/ExoSpaceCardFront.vue
+++ /dev/null
@@ -1,510 +0,0 @@
-<template>
-  <v-hover v-slot="{ hover }">
-    <v-card
-      :id="spaceMenuParentId"
-      :elevation="hover && !isMobile && 4 || 0"
-      class="spaceCardItem d-block d-sm-flex mx-2"
-      :outlined="!isMobile">
-      <v-img
-        :src="spaceBannerUrl"
-        transition="none"
-        height="80px"
-        min-height="80px"
-        max-height="80px"
-        min-width="100%"
-        class="white--text align-start d-block spaceBannerImg"
-        eager />
-
-      <div class="spaceToolbarIcons px-2">
-        <v-btn
-          :title="$t('spaceList.label.openSpaceInfo')"
-          icon
-          small
-          class="spaceInfoIcon d-flex"
-          @click="$emit('flip')">
-          <v-icon size="12">fa-info</v-icon>
-        </v-btn>
-        <v-spacer />
-        <exo-space-favorite-action
-          v-if="space.isMember && !isMobile"
-          :is-favorite="space.isFavorite"
-          :space-id="space.id" />
-        <div v-if="isMobile">
-          <v-icon 
-            size="14" 
-            class="my-3" 
-            @click="openBottomMenu">
-            fa-ellipsis-v
-          </v-icon>
-          <v-bottom-sheet v-model="bottomMenu" class="pa-0">
-            <v-sheet class="text-center" height="150px">
-              <v-list dense>
-                <v-list-item 
-                  v-if="space.isMember"
-                  @click="leave">
-                  <v-list-item-title class="align-center d-flex">
-                    <v-icon class="mx-4" size="16">fas fa-minus-circle</v-icon>
-                    <span class="mx-2">
-                      {{ $t('spacesList.button.leave') }}
-                    </span>
-                  </v-list-item-title>
-                </v-list-item>
-                <v-list-item 
-                  v-else-if="space.isInvited">
-                  <v-list-item-title class="align-center d-flex">
-                    <div @click="acceptToJoin">
-                      <v-icon class="mx-4" size="16">mdi-check</v-icon>
-                      <span class="mx-2">
-                        {{ $t('spacesList.button.acceptToJoin') }}
-                      </span>
-                    </div>
-                    <v-divider
-                      vertical />
-                    <div @click="refuseToJoin">
-                      <v-icon class="mx-4" size="16">mdi-close</v-icon>
-                      <span class="mx-2">
-                        {{ $t('spacesList.button.refuseToJoin') }}
-                      </span>
-                    </div>
-                  </v-list-item-title>
-                </v-list-item>
-                <v-list-item 
-                  v-else-if="space.subscription === 'open' && !space.isMember"
-                  @click="join">
-                  <v-list-item-title class="align-center d-flex">
-                    <v-icon class="mx-4" size="16">fas fa-plus-circle</v-icon>
-                    <span class="mx-2">
-                      {{ $t('spacesList.button.join') }}
-                    </span>
-                  </v-list-item-title>
-                </v-list-item>
-                <v-list-item 
-                  v-else-if="space.subscription === 'validation' && !space.isMember && !space.isPending"
-                  @click="requestJoin">
-                  <v-list-item-title class="align-center d-flex">
-                    <v-icon class="mx-4" size="16">fas fa-plus-circle</v-icon>
-                    <span class="mx-2">
-                      {{ $t('spacesList.button.requestJoin') }}
-                    </span>
-                  </v-list-item-title>
-                </v-list-item>
-                <v-list-item 
-                  v-if="space.isPending"
-                  @click="cancelRequest">
-                  <v-list-item-title class="align-center d-flex">
-                    <v-icon class="mx-4" size="16">fas fa-minus-circle</v-icon>
-                    <span class="mx-2">
-                      {{ $t('spacesList.button.cancelRequest') }}
-                    </span>
-                  </v-list-item-title>
-                </v-list-item>
-                <v-list-item 
-                  v-if="space.isManager"
-                  @click="editSpace">
-                  <v-list-item-title class="align-center d-flex">
-                    <v-icon class="mx-4" size="16">fa-edit</v-icon>
-                    <span class="mx-2">
-                      {{ $t('spacesList.button.edit') }}
-                    </span>
-                  </v-list-item-title>
-                </v-list-item>
-                <v-list-item v-if="space.isMember">
-                  <v-list-item-title>
-                    <exo-space-favorite-action
-                      :is-favorite="space.isFavorite"
-                      :space-id="space.id"
-                      extra-class="ms-3"
-                      display-label />
-                  </v-list-item-title>
-                </v-list-item>
-              </v-list>
-            </v-sheet>
-          </v-bottom-sheet>
-        </div>
-        <template v-if="canUseActionsMenu">
-          <v-btn
-            :title="$t('spaceList.label.openSpaceMenu')"
-            icon
-            text
-            class="spaceMenuIcon d-block"
-            @click="displayActionMenu = true">
-            <v-icon size="21">mdi-dots-vertical</v-icon>
-          </v-btn>
-          <v-menu
-            ref="actionMenu"
-            v-model="displayActionMenu"
-            :attach="`#${spaceMenuParentId}`"
-            transition="slide-x-reverse-transition"
-            content-class="spaceActionMenu"
-            offset-y>
-            <v-list class="pa-0" dense>
-              <template v-if="space.canEdit">
-                <v-list-item @click="editSpace">
-                  <v-list-item-title>
-                    <i class="uiIcon uiIconEdit"></i>
-                    {{ $t('spacesList.button.edit') }}
-                  </v-list-item-title>
-                </v-list-item>
-                <v-list-item @click="removeSpaceConfirm">
-                  <v-list-item-title>
-                    <i class="uiIcon uiIconTrash"></i>
-                    {{ $t('spacesList.button.remove') }}
-                  </v-list-item-title>
-                </v-list-item>
-              </template>
-              <v-list-item
-                v-for="(extension, i) in enabledProfileActionExtensions"
-                :key="i"
-                @click="extension.click(space)">
-                <v-list-item-title>
-                  <i :class="extension.icon ? extension.icon : 'hidden'" class="uiIcon "></i>
-                  {{ extension.title }}
-                </v-list-item-title>
-              </v-list-item>
-            </v-list>
-          </v-menu>
-        </template>
-      </div>
-
-      <div class="spaceAvatar">
-        <a :href="url">
-          <v-img
-            :src="`${spaceAvatarUrl}&size=75x75`"
-            transition="none"
-            class="mx-auto"
-            height="75px"
-            width="75px"
-            max-height="75px"
-            max-width="75px"
-            eager />
-        </a>
-      </div>
-
-      <v-card-text
-        class="spaceCardBody align-center py-sm-2">
-        <a
-          :href="url"
-          :title="space.displayName"
-          :class="isMobile && 'text-truncate-2 mt-0' || 'text-truncate-2'"
-          class="spaceDisplayName font-weight-bold">
-          {{ space.displayName }}
-        </a>
-      </v-card-text>
-      <v-list-item v-if="!isMobile" class="spaceCardActions pa-2">
-        <exo-confirm-dialog
-          ref="confirmDialog"
-          :title="confirmTitle"
-          :message="confirmMessage"
-          :ok-label="$t('spacesList.label.ok')"
-          :cancel-label="okMethod && $t('spacesList.label.cancel')"
-          @ok="okConfirmDialog"
-          @dialog-closed="closeConfirmDialog" />
-        <v-btn
-          v-if="space.isMember"
-          :loading="sendingAction"
-          :disabled="sendingAction || space.isUserBound"
-          class="btn mx-auto spaceMembershipButton leaveSpaceButton"
-          depressed
-          block
-          @click="leaveConfirm">
-          <v-icon>mdi-minus</v-icon>
-          <span class="spaceMembershipButtonText d-inline">
-            {{ $t('spacesList.button.leave') }}
-          </span>
-        </v-btn>
-        <div v-else-if="space.isInvited" class="invitationButtons">
-          <div class="acceptToJoinSpaceButtonParent">
-            <v-btn
-              :loading="sendingAction"
-              :disabled="sendingAction"
-              class="btn mx-auto spaceMembershipButton acceptToJoinSpaceButton"
-              depressed
-              @click="acceptToJoin">
-              <v-icon>mdi-check</v-icon>
-              <span class="d-flex">
-                {{ $t('spacesList.button.acceptToJoin') }}
-              </span>
-            </v-btn>
-            <v-btn
-              class="btn spaceButtonMenu d-inline"
-              depressed
-              x-small
-              @click="displaySecondButton = !displaySecondButton">
-              <v-icon>mdi-menu-down</v-icon>
-            </v-btn>
-          </div>
-          <v-btn
-            v-show="displaySecondButton"
-            :loading="sendingSecondAction"
-            :disabled="sendingSecondAction"
-            class="btn mx-auto spaceMembershipButton refuseToJoinSpaceButton"
-            depressed
-            block
-            @click="refuseToJoin">
-            <v-icon>mdi-close</v-icon>
-            <span class="d-flex">
-              {{ $t('spacesList.button.refuseToJoin') }}
-            </span>
-          </v-btn>
-        </div>
-        <v-btn
-          v-else-if="space.isPending"
-          :loading="sendingAction"
-          :disabled="sendingAction"
-          class="btn mx-auto spaceMembershipButton cancelRequestToJoinSpaceButton"
-          depressed
-          block
-          @click="cancelRequest">
-          <v-icon>mdi-close</v-icon>
-          <span class="spaceMembershipButtonText d-inline">
-            {{ $t('spacesList.button.cancelRequest') }}
-          </span>
-        </v-btn>
-        <v-btn
-          v-else-if="space.subscription === 'open'"
-          :loading="sendingAction"
-          :disabled="sendingAction"
-          class="btn mx-auto spaceMembershipButton joinSpaceButton"
-          depressed
-          block
-          @click="join">
-          <v-icon>mdi-plus</v-icon>
-          <span class="spaceMembershipButtonText d-inline">
-            {{ $t('spacesList.button.join') }}
-          </span>
-        </v-btn>
-        <v-btn
-          v-else-if="space.subscription === 'validation'"
-          :loading="sendingAction"
-          :disabled="sendingAction"
-          class="btn mx-auto spaceMembershipButton joinSpaceButton"
-          depressed
-          block
-          @click="requestJoin">
-          <v-icon>mdi-plus</v-icon>
-          <span class="spaceMembershipButtonText d-inline">
-            {{ $t('spacesList.button.requestJoin') }}
-          </span>
-        </v-btn>
-        <div
-          v-else
-          :title="$t('spacesList.label.closedSpace')"
-          class="joinSpaceDisabledLabel">
-          <v-btn
-            disabled
-            class="btn mx-auto spaceMembershipButton joinSpaceButton"
-            depressed
-            block
-            @click="join">
-            <v-icon>mdi-plus</v-icon>
-            <span class="spaceMembershipButtonText d-inline">
-              {{ $t('spacesList.button.join') }}
-            </span>
-          </v-btn>
-        </div>
-      </v-list-item>
-    </v-card>
-  </v-hover>
-</template>
-
-<script>
-export default {
-  props: {
-    space: {
-      type: Object,
-      default: null,
-    },
-    profileActionExtensions: {
-      type: Array,
-      default: () => [],
-    },
-  },
-  data: () => ({
-    displayActionMenu: false,
-    waitTimeUntilCloseMenu: 200,
-    sendingAction: false,
-    sendingSecondAction: false,
-    confirmTitle: '',
-    confirmMessage: '',
-    okMethod: null,
-    displaySecondButton: false,
-    bottomMenu: false,
-  }),
-  computed: {
-    spaceAvatarUrl() {
-      return this.space && (this.space.avatarUrl || `/portal/rest/v1/social/spaces/${this.space.prettyName}/avatar`);
-    },
-    spaceBannerUrl() {
-      return this.space && (this.space.bannerUrl || `/portal/rest/v1/social/spaces/${this.space.prettyName}/banner`);
-    },
-    spaceMenuParentId() {
-      return this.space && this.space.id && `spaceMenuParent-${this.space.id}` || 'spaceMenuParent';
-    },
-    enabledProfileActionExtensions() {
-      if (!this.profileActionExtensions || !this.space || !this.space.isMember) {
-        return [];
-      }
-      return this.profileActionExtensions.slice().filter(extension => extension.enabled(this.space));
-    },
-    canUseActionsMenu() {
-      return this.space && (this.space.canEdit || this.enabledProfileActionExtensions.length);
-    },
-    url() {
-      if (this.space && this.space.groupId) {
-        const uriPart = this.space.groupId.replace(/\//g, ':');
-        return `${eXo.env.portal.context}/g/${uriPart}/`;
-      } else {
-        return '#';
-      }
-    },
-    isMobile() {
-      return this.$vuetify.breakpoint.smAndDown;
-    },
-    isFavorite() {
-      return this.space?.isFavorite === 'true';
-    },
-  },
-  created() {
-    $(document).on('mousedown', () => {
-      if (this.displayActionMenu) {
-        window.setTimeout(() => {
-          this.displayActionMenu = false;
-          this.displaySecondButton = false;
-        }, this.waitTimeUntilCloseMenu);
-      }
-    });
-  },
-  methods: {
-    editSpace() {
-      this.$root.$emit('editSpace', this.space);
-    },
-    removeSpaceConfirm() {
-      this.openConfirmDialog(
-        this.$t('spacesList.title.deleteSpace'),
-        this.$t('spacesList.message.deleteSpace'),
-        this.removeSpace);
-    },
-    removeSpace() {
-      this.sendingAction = true;
-      this.$spaceService.removeSpace(this.space.id)
-        .then(() => this.$emit('refresh'))
-        .catch((e) => {
-          // eslint-disable-next-line no-console
-          console.error('Error processing action', e);
-        })
-        .finally(() => {
-          this.sendingAction = false;
-        });
-    },
-    leaveConfirm() {
-      const isOnlyManagrLeftInSpace = this.space.isManager && this.space.managersCount <= 1;
-      if (isOnlyManagrLeftInSpace) {
-        this.openConfirmDialog(
-          this.$t('spacesList.warning'),
-          this.$t('spacesList.warning.lastManager'));
-      } else {
-        this.openConfirmDialog(
-          this.$t('spacesList.title.leaveSpace'),
-          this.$t('spacesList.message.leaveSpace', {0: `<b>${this.space.displayName}</b>`}),
-          this.leave);
-      }
-    },
-    leave() {
-      this.sendingAction = true;
-      this.$spaceService.leave(this.space.id)
-        .then(() => this.$emit('refresh'))
-        .catch((e) => {
-          // eslint-disable-next-line no-console
-          console.error('Error processing action', e);
-        })
-        .finally(() => {
-          this.sendingAction = false;
-        });
-    },
-    acceptToJoin() {
-      this.sendingAction = true;
-      this.$spaceService.accept(this.space.id)
-        .then(() => this.$emit('refresh'))
-        .catch((e) => {
-          // eslint-disable-next-line no-console
-          console.error('Error processing action', e);
-        })
-        .finally(() => {
-          this.sendingAction = false;
-        });
-    },
-    refuseToJoin() {
-      this.sendingSecondAction = true;
-      this.$spaceService.deny(this.space.id)
-        .then(() => this.$emit('refresh'))
-        .catch((e) => {
-          // eslint-disable-next-line no-console
-          console.error('Error processing action', e);
-        })
-        .finally(() => {
-          this.sendingSecondAction = false;
-        });
-    },
-    join() {
-      this.sendingAction = true;
-      this.$spaceService.join(this.space.id)
-        .then(() => this.$emit('refresh'))
-        .catch((e) => {
-          // eslint-disable-next-line no-console
-          console.error('Error processing action', e);
-        })
-        .finally(() => {
-          this.sendingAction = false;
-        });
-    },
-    requestJoin() {
-      this.sendingAction = true;
-      this.$spaceService.requestJoin(this.space.id)
-        .then(() => this.$emit('refresh'))
-        .catch((e) => {
-          // eslint-disable-next-line no-console
-          console.error('Error processing action', e);
-        })
-        .finally(() => {
-          this.sendingAction = false;
-        });
-    },
-    cancelRequest() {
-      this.sendingAction = true;
-      this.$spaceService.cancel(this.space.id)
-        .then(() => this.$emit('refresh'))
-        .catch((e) => {
-          // eslint-disable-next-line no-console
-          console.error('Error processing action', e);
-        })
-        .finally(() => {
-          this.sendingAction = false;
-        });
-    },
-    openConfirmDialog(title, message, okMethod) {
-      this.confirmTitle = title;
-      this.confirmMessage = message;
-      if (okMethod) {
-        this.okMethod = okMethod;
-      } else {
-        this.okMethod = null;
-      }
-      this.$refs.confirmDialog.open();
-    },
-    okConfirmDialog() {
-      if (this.okMethod) {
-        this.okMethod();
-      }
-    },
-    closeConfirmDialog() {
-      this.confirmTitle = '';
-      this.confirmMessage = '';
-      this.okMethod = null;
-    },
-    openBottomMenu() {
-      this.bottomMenu = true;
-    },
-  },
-};
-</script>
-
diff --git a/webapp/portlet/src/main/webapp/vue-apps/spaces-list/components/ExoSpaceCardReverse.vue b/webapp/portlet/src/main/webapp/vue-apps/spaces-list/components/ExoSpaceCardReverse.vue
deleted file mode 100644
index a1008649093..00000000000
--- a/webapp/portlet/src/main/webapp/vue-apps/spaces-list/components/ExoSpaceCardReverse.vue
+++ /dev/null
@@ -1,66 +0,0 @@
-<template>
-  <v-hover v-slot="{ hover }">
-    <v-card
-      :id="spaceMenuParentId"
-      :elevation="hover && 4 || 0"
-      class="spaceCardItem d-flex flex-column"
-      outlined>
-      <v-btn
-        absolute
-        small
-        icon
-        class="spaceInfoIcon ma-2"
-        @click="$emit('flip')">
-        <v-icon size="12">fa-info</v-icon>
-      </v-btn>
-      <div class="d-flex pt-3 pb-2">
-        <p class="font-weight-bold ma-auto">
-          {{ $t('spacesList.label.description') }}
-        </p>
-      </div>
-      <v-card-text class="align-center py-0 flex-grow-1">
-        <div
-          v-if="space.description"
-          v-sanitized-html="space.description"
-          :title="spaceDescriptionTitle"
-          class="text-truncate-3"></div>
-      </v-card-text>
-
-      <template v-if="space && space.managers && space.managers.length">
-        <div class="d-flex px-3 pt-3">
-          <p class="font-weight-bold ma-auto">
-            {{ $t('spacesList.title.managers') }}
-          </p>
-        </div>
-        <v-card-text class="align-center flex-grow-0">
-          <exo-user-avatars-list
-            :users="space.managers"
-            :icon-size="28"
-            :margin-left="space.managers.length > 1 && 'ml-n4' || ''"
-            :compact="space.managers.length > 1"
-            max="5"
-            clickable="'false'"
-            avatar-overlay-position
-            @open-detail="$root.$emit('displaySpaceManagers', space)" />
-        </v-card-text>
-      </template>
-    </v-card>
-  </v-hover>
-</template>
-
-<script>
-export default {
-  props: {
-    space: {
-      type: Object,
-      default: null,
-    },
-  },
-  computed: {
-    spaceDescriptionTitle() {
-      return this.$utils.htmlToText(this.space.description || '');
-    },
-  },
-};
-</script>
-
diff --git a/webapp/portlet/src/main/webapp/vue-apps/spaces-list/components/ExoSpaceManagersDrawer.vue b/webapp/portlet/src/main/webapp/vue-apps/spaces-list/components/ExoSpaceManagersDrawer.vue
deleted file mode 100644
index f7f59b0346f..00000000000
--- a/webapp/portlet/src/main/webapp/vue-apps/spaces-list/components/ExoSpaceManagersDrawer.vue
+++ /dev/null
@@ -1,30 +0,0 @@
-<template>
-  <exo-drawer ref="managersDrawer" right>
-    <template slot="title">
-      {{ $t('spacesList.title.managers') }}
-    </template>
-    <template v-if="space && space.managers" slot="content">
-      <v-layout column class="ma-3">
-        <exo-user-avatar
-          v-for="manager in space.managers"
-          :key="manager.id"
-          :identity="manager"
-          :extra-class="'my-2'"
-          popover />
-      </v-layout>
-    </template>
-  </exo-drawer>
-</template>
-<script>
-export default {
-  data: () => ({
-    space: null,
-  }),
-  mounted() {
-    this.$root.$on('displaySpaceManagers', space => {
-      this.space = space;
-      this.$refs.managersDrawer.open();
-    });
-  }
-};
-</script>
\ No newline at end of file
diff --git a/webapp/portlet/src/main/webapp/vue-apps/spaces-list/components/ExoSpacesCardList.vue b/webapp/portlet/src/main/webapp/vue-apps/spaces-list/components/ExoSpacesCardList.vue
deleted file mode 100644
index 2a0a57c154c..00000000000
--- a/webapp/portlet/src/main/webapp/vue-apps/spaces-list/components/ExoSpacesCardList.vue
+++ /dev/null
@@ -1,203 +0,0 @@
-<template>
-  <v-card flat>
-    <v-progress-linear
-      v-if="loadingSpaces"
-      indeterminate
-      height="2"
-      color="primary" />
-    <v-card-text id="spacesListBody" class="pb-0">
-      <v-item-group>
-        <v-container class="pa-0">
-          <v-row v-if="filteredSpaces && filteredSpaces.length" class="ma-0 border-box-sizing">
-            <v-col
-              v-for="space in filteredSpaces"
-              :key="space.id"
-              cols="12"
-              md="6"
-              lg="4"
-              xl="4"
-              class="pa-0">
-              <exo-space-card
-                :space="space"
-                :profile-action-extensions="profileActionExtensions"
-                @refresh="searchSpaces" />
-            </v-col>
-          </v-row>
-          <div v-else-if="!loadingSpaces" class="d-flex text-center noSpacesYetBlock">
-            <div class="ma-auto noSpacesYet">
-              <p class="noSpacesYetIcons">
-                <v-icon>fa-chevron-left</v-icon>
-                <v-icon>fa-chevron-right</v-icon>
-              </p>
-              <template v-if="hasSpaces">
-                <p class="text-title">
-                  {{ $t('spacesOverview.label.noResults') }}
-                </p>
-              </template>
-              <template v-else>
-                <p class="text-title">
-                  {{ $t('spacesList.label.noSpacesYet') }}
-                </p>
-                <div>
-                  {{ $t('spacesList.label.noSpacesYetDescription1') }}
-                </div>
-                <span>
-                  {{ $t('spacesList.label.noSpacesYetDescription2') }}
-                  <v-btn
-                    link
-                    text
-                    class="primary--text px-0 addNewSpaceLink"
-                    @click="$root.$emit('addNewSpace')">
-                    {{ $t('spacesList.label.noSpacesLink') }}
-                  </v-btn>
-                </span>
-              </template>
-            </div>
-          </div>
-        </v-container>
-      </v-item-group>
-    </v-card-text>
-    <v-card-actions id="spacesListFooter" class="pt-0 px-5 border-box-sizing">
-      <v-btn
-        v-if="canShowMore"
-        :loading="loadingSpaces"
-        :disabled="loadingSpaces"
-        class="loadMoreButton ma-auto btn"
-        block
-        @click="loadNextPage">
-        {{ $t('spacesList.button.showMore') }}
-      </v-btn>
-    </v-card-actions>
-  </v-card>
-</template>
-
-<script>
-export default {
-  props: {
-    keyword: {
-      type: String,
-      default: null,
-    },
-    filter: {
-      type: String,
-      default: null,
-    },
-    spacesSize: {
-      type: Number,
-      default: 0,
-    },
-    loadingSpaces: {
-      type: Boolean,
-      default: false,
-    },
-  },
-  data: () => ({
-    profileActionExtensions: [],
-    startSearchAfterInMilliseconds: 600,
-    endTypingKeywordTimeout: 50,
-    startTypingKeywordTimeout: 0,
-    hasSpaces: false,
-    offset: 0,
-    pageSize: 20,
-    limit: 20,
-    spaces: [],
-    limitToFetch: 0,
-    originalLimitToFetch: 0,
-    typing: false,
-  }),
-  computed: {
-    canShowMore() {
-      return this.loadingSpaces || this.spaces.length >= this.limitToFetch;
-    },
-    filteredSpaces() {
-      if (!this.keyword || !this.loadingSpaces) {
-        return this.spaces;
-      } else {
-        return this.spaces.slice().filter(space => space.displayName && space.displayName.toLowerCase().indexOf(this.keyword.toLowerCase()) >= 0
-            || space.description && space.description.toLowerCase().indexOf(this.keyword.toLowerCase()) >= 0 );
-      }
-    },
-    selectedSpaceIndex() {
-      return this.spaces.findIndex(space => space.spaceUrl === eXo.env.server.portalBaseURL || eXo.env.server.portalBaseURL.indexOf(`${space.spaceUrl}/`) === 0);
-    },
-  },
-  watch: {
-    keyword() {
-      if (!this.keyword?.length) {
-        this.resetSearch();
-        this.searchSpaces();
-        return;
-      }
-      this.startTypingKeywordTimeout = Date.now();
-      if (!this.typing) {
-        this.typing = true;
-        this.waitForEndTyping();
-      }
-    },
-    spaces() {
-      this.spaces.forEach(space => {
-        space.spaceUrl = `${eXo.env.portal.context}${space.url}`;
-      });
-    },
-    limitToFetch() {
-      this.searchSpaces();
-    },
-    filter() {
-      this.searchSpaces();
-    },
-    typing() {
-      if (this.typing) {
-        this.$emit('loading-spaces', true);
-      }
-    },
-  }, 
-  created() {
-    this.originalLimitToFetch = this.limitToFetch = this.limit;
-
-    document.addEventListener('extension-profile-extension-action-updated', this.refreshExtensions);
-    this.refreshExtensions();
-  },
-  methods: {
-    refreshExtensions() {
-      this.profileActionExtensions = extensionRegistry.loadExtensions('profile-extension', 'action') || [];
-    },
-    searchSpaces() {
-      this.$emit('loading-spaces', true);
-      const expand = this.filter === 'requests' ? 'pending,favorite' : 'managers,favorite';
-      return this.$spaceService.getSpaces(this.keyword, this.offset, this.limitToFetch, this.filter, expand)
-        .then(data => {
-          this.spaces = data && data.spaces || [];
-          this.spacesSize = data && data.size || 0;
-          this.hasSpaces = this.hasSpaces || this.spacesSize > 0;
-          this.$emit('loaded', this.spacesSize);
-          return this.$nextTick();
-        })
-        .then(() => {
-          if (this.keyword && this.filteredSpaces.length < this.originalLimitToFetch && this.spaces.length >= this.limitToFetch) {
-            this.limitToFetch += this.pageSize;
-          }
-        })
-        .finally(() => this.$emit('loading-spaces', false));
-    },
-    resetSearch() {
-      if (this.limitToFetch !== this.originalLimitToFetch) {
-        this.limitToFetch = this.originalLimitToFetch;
-      }
-    },
-    loadNextPage() {
-      this.originalLimitToFetch = this.limitToFetch += this.pageSize;
-    },
-    waitForEndTyping() {
-      window.setTimeout(() => {
-        if (Date.now() - this.startTypingKeywordTimeout > this.startSearchAfterInMilliseconds) {
-          this.typing = false;
-          this.searchSpaces();
-        } else {
-          this.waitForEndTyping();
-        }
-      }, this.endTypingKeywordTimeout);
-    },
-  }
-};
-</script>
-
diff --git a/webapp/portlet/src/main/webapp/vue-apps/spaces-list/components/ExoSpacesList.vue b/webapp/portlet/src/main/webapp/vue-apps/spaces-list/components/ExoSpacesList.vue
deleted file mode 100644
index 5de208cee2a..00000000000
--- a/webapp/portlet/src/main/webapp/vue-apps/spaces-list/components/ExoSpacesList.vue
+++ /dev/null
@@ -1,57 +0,0 @@
-<template>
-  <v-app class="application-body" flat>
-    <exo-spaces-toolbar
-      :keyword="keyword"
-      :filter="filter"
-      :spaces-size="spacesSize"
-      :can-create-space="canCreateSpace"
-      @keyword-changed="keyword = $event"
-      @filter-changed="filter = $event" />
-    <exo-spaces-card-list
-      ref="spacesList"
-      :keyword="keyword"
-      :filter="filter"
-      :loading-spaces="loadingSpaces"
-      :spaces-size="spacesSize"
-      @loading-spaces="loadingSpaces = $event"
-      @loaded="spacesLoaded" />
-    <exo-space-managers-drawer />
-    <exo-space-form-drawer />
-  </v-app>    
-</template>
-
-<script>
-
-export default {
-  props: {
-    canCreateSpace: {
-      type: Boolean,
-      default: false,
-    },
-    filter: {
-      type: String,
-      default: null,
-    },
-    appId: {
-      type: String,
-      default: null,
-    },
-  },
-  data: () => ({
-    keyword: null,
-    spacesSize: 0,
-    loadingSpaces: false,
-    initialized: false,
-  }),
-  methods: {
-    spacesLoaded(spacesSize) {
-      this.spacesSize = spacesSize;
-      if (!this.initialized) {
-        this.$root.$applicationLoaded();
-        this.initialized = true;
-      }
-    }
-  },
-};
-</script>
-
diff --git a/webapp/portlet/src/main/webapp/vue-apps/spaces-list/components/ExoSpacesToolbar.vue b/webapp/portlet/src/main/webapp/vue-apps/spaces-list/components/ExoSpacesToolbar.vue
deleted file mode 100644
index b2d04f2060d..00000000000
--- a/webapp/portlet/src/main/webapp/vue-apps/spaces-list/components/ExoSpacesToolbar.vue
+++ /dev/null
@@ -1,176 +0,0 @@
-<template>
-  <v-toolbar id="spacesListToolbar" flat>
-    <v-toolbar-title 
-      v-if="canCreateSpace" 
-      class="flex-shrink-0">
-      <v-icon
-        v-if="menuHeaderChanged"
-        @click="changeHeaderMenu">
-        fas fa-arrow-left
-      </v-icon>
-      <v-btn
-        v-else
-        id="addNewSpaceButton"
-        class="btn btn-primary mx-2 mx-md-0 px-md-2 px-0 addNewSpaceButton"
-        :small="isMobile"
-        @click="$root.$emit('addNewSpace')">
-        <v-icon size="18" dark>fa-plus</v-icon>
-        <span class="ms-2 d-none d-lg-inline">
-          {{ $t('spacesList.label.addNewSpace') }}
-        </span>
-      </v-btn>
-    </v-toolbar-title>
-    <div
-      class="text-subtitle ms-3 d-none d-sm-flex">
-      {{ $t('spacesList.label.spacesSize', {0: spacesSize}) }}
-    </div>
-    <v-spacer v-if="!isMobile" />
-    <div>
-      <v-text-field
-        v-if="!isMobile"
-        v-model="keyword"
-        :placeholder="$t('spacesList.label.filterSpaces')"
-        prepend-inner-icon="fa-filter"
-        class="inputSpacesFilter pa-0 me-3 mb-n2 my-auto" />
-      <v-text-field
-        v-else-if="isMobile && menuHeaderChanged"
-        v-model="keyword"
-        :placeholder="$t('spacesList.label.filterSpacesByName')"
-        prepend-inner-icon="fa-filter"
-        class="inputSpacesFilter pa-0 ms-3 mb-n2 my-auto"
-        clearable />
-    </div>
-    <v-spacer v-if="isMobile" />
-    <v-scale-transition>
-      <select
-        v-model="filter"
-        class="selectSpacesFilter my-auto me-2 ignore-vuetify-classes d-none d-sm-inline">
-        <option
-          v-for="spaceFilter in spaceFilters"
-          :key="spaceFilter.value"
-          :value="spaceFilter.value">
-          {{ spaceFilter.text }}
-        </option>
-      </select>
-    </v-scale-transition>
-    <div class="d-sm-none">
-      <v-icon
-        v-if="!menuHeaderChanged"
-        @click="changeHeaderMenu">
-        fa-filter
-      </v-icon>
-      <v-icon
-        v-else
-        @click="openBottomMenu">
-        fa-sliders-h
-      </v-icon>
-    </div>
-    <v-bottom-sheet v-model="bottomMenu" class="pa-0">
-      <v-sheet class="text-center" height="210px">
-        <v-toolbar
-          color="primary"
-          dark
-          class="border-box-sizing">
-          <v-btn text @click="bottomMenu = false">
-            {{ $t('spacesList.button.cancel') }}
-          </v-btn>
-          <v-spacer />
-          <v-toolbar-title>
-            <v-icon>fa-filter</v-icon>
-            {{ $t('spacesList.label.filter') }}
-          </v-toolbar-title>
-          <v-spacer />
-          <v-btn text @click="changeFilterSelection">
-            {{ $t('spacesList.button.confirm') }}
-          </v-btn>
-        </v-toolbar>
-        <v-list>
-          <v-list-item
-            v-for="spaceFilter in spaceFilters"
-            :key="spaceFilter"
-            @click="filterToChange = spaceFilter.value">
-            <v-list-item-title class="align-center d-flex">
-              <v-icon v-if="filterToChange === spaceFilter.value">fa-check</v-icon>
-              <span v-else class="me-6"></span>
-              <v-spacer />
-              <div>
-                {{ spaceFilter.text }}
-              </div>
-              <v-spacer />
-              <span class="me-6"></span>
-            </v-list-item-title>
-          </v-list-item>
-        </v-list>
-      </v-sheet>
-    </v-bottom-sheet>
-  </v-toolbar>
-</template>
-
-<script>
-
-export default {
-  props: {
-    canCreateSpace: {
-      type: Boolean,
-      default: false,
-    },
-    keyword: {
-      type: String,
-      default: null,
-    },
-    filter: {
-      type: String,
-      default: null,
-    },
-    spacesSize: {
-      type: String,
-      default: null,
-    },
-  },
-  data: () => ({
-    filterToChange: null,
-    bottomMenu: false,
-    menuHeaderChanged: false,
-  }),
-  computed: {
-    spaceFilters() {
-      return [{
-        text: this.$t('spacesList.filter.all'),
-        value: 'all',
-      },{
-        text: this.$t('spacesList.filter.userSpaces'),
-        value: 'member',
-      },{
-        text: this.$t('spacesList.filter.favoriteSpaces'),
-        value: 'favorite',
-      }];
-    },
-    isMobile() {
-      return this.$vuetify.breakpoint.smAndDown;
-    }
-  },
-  watch: {
-    keyword() {
-      this.$emit('keyword-changed', this.keyword);
-    },
-    filter() {
-      this.$emit('filter-changed', this.filter);
-    },
-  },
-  methods: {
-    openBottomMenu() {
-      this.filterToChange = this.filter;
-      this.bottomMenu = true;
-    },
-    changeFilterSelection() {
-      this.bottomMenu = false;
-      this.filter = this.filterToChange;
-      this.changeHeaderMenu();
-    },
-    changeHeaderMenu() {
-      this.menuHeaderChanged = !this.menuHeaderChanged;
-    }
-  }
-};
-</script>
-
diff --git a/webapp/portlet/src/main/webapp/vue-apps/spaces-list/components/SpaceCard.vue b/webapp/portlet/src/main/webapp/vue-apps/spaces-list/components/SpaceCard.vue
new file mode 100644
index 00000000000..b28420c7a0e
--- /dev/null
+++ b/webapp/portlet/src/main/webapp/vue-apps/spaces-list/components/SpaceCard.vue
@@ -0,0 +1,143 @@
+<!--
+
+ This file is part of the Meeds project (https://meeds.io/).
+
+ Copyright (C) 2020 - 2024 Meeds Association contact@meeds.io
+
+ This program is free software; you can redistribute it and/or
+
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 3 of the License, or (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public License
+ along with this program; if not, write to the Free Software Foundation,
+ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+-->
+<template>
+  <v-hover v-model="hoverCard">
+    <v-card
+      :href="spaceUrl"
+      :min-height="minHeight"
+      :height="height"
+      :max-height="height"
+      :elevation="hoverCard && 3 || 0"
+      :min-width="minWidth"
+      :max-width="maxWidth"
+      width="auto"
+      class="d-flex flex-column application-border-radius border-color">
+      <space-card-unread-badge :space="space" />
+      <v-card
+        :min-height="avatarSize"
+        :max-height="avatarSize"
+        min-width="100%"
+        max-width="100%"
+        class="d-flex mt-4 px-4"
+        flat>
+        <v-card
+          :min-width="avatarSize"
+          :max-width="avatarSize"
+          :min-height="avatarSize"
+          :max-height="avatarSize"
+          class="spaceAvatar overflow-hidden d-flex align-center justify-center z-index-two"
+          flat>
+          <img
+            :src="space.avatarUrl"
+            :alt="$t('spaceList.spaceAvatar.alt')"
+            style="max-width: 1000%; max-height: 100%;"
+            height="100%"
+            width="auto"
+            class="overflow-hidden">
+        </v-card>
+        <div class="d-flex flex-column flex-grow-1 justify-center flex-shrink-1 overflow-hidden ps-4 ps-sm-3">
+          <div
+            v-text="spaceDisplayName"
+            class="flex-shrink-0 text-truncate-2 max-height-2lh font-weight-bold line-height-normal full-width"></div>
+        </div>
+      </v-card>
+      <div v-if="!$root.isMobile" class="flex-grow-1 flex-shrink-1 px-4 mt-4">
+        <div
+          v-sanitized-html="spaceDescription"
+          class="text-truncate-3 max-height-3lh full-width flex-shrink-1"></div>
+      </div>
+      <v-card
+        class="d-flex align-center full-width flex-grow-0 flex-shrink-0 my-2 px-2 position-absolute b-0"
+        flat>
+        <div v-if="displayMembersCount" class="d-flex align-center ps-2">
+          <div
+            v-sanitized-html="spaceMembersCount"
+            class="flex-shrink-0 text-subtitle"></div>
+        </div>
+        <v-spacer />
+        <space-card-menu
+          :space="space"
+          :space-action-extensions="enabledSpaceActionExtensions"
+          class="ms-1" />
+      </v-card>
+    </v-card>
+  </v-hover>
+</template>
+<script>
+export default {
+  props: {
+    space: {
+      type: Object,
+      default: () => ({}),
+    },
+    height: {
+      type: Number,
+      default: () => 227,
+    },
+    minHeight: {
+      type: Number,
+      default: () => 227,
+    },
+    minWidth: {
+      type: Number,
+      default: () => 220,
+    },
+    maxWidth: {
+      type: Number,
+      default: () => (366 - 18),
+    },
+    displayMembersCount: {
+      type: Boolean,
+      default: false,
+    },
+    spaceActionExtensions: {
+      type: Array,
+      default: null,
+    },
+  },
+  data: () => ({
+    avatarSize: 65,
+    hoverCard: false,
+  }),
+  computed: {
+    spaceDisplayName() {
+      return this.space.displayName;
+    },
+    spaceDescription() {
+      return this.space.description?.replace?.(/<p>/g, '<div>')?.replace?.(/<\/p>/g, '</div>')?.replace?.(/<ul>/g, '<ul class="ma-0 pa-0">') || '';
+    },
+    spaceMembersCount() {
+      return this.$t('spaceList.spaceMembers', {0: `<strong>${this.space.membersCount}</strong>`});
+    },
+    spaceUrl() {
+      return `${eXo.env.portal.context}/s/${this.space.id}`;
+    },
+    enabledSpaceActionExtensions() {
+      if (!this.spaceActionExtensions || !this.space || !this.space.isMember) {
+        return [];
+      }
+      return this.spaceActionExtensions.slice().filter(extension => extension.enabled(this.space));
+    },
+  },
+};
+</script>
\ No newline at end of file
diff --git a/webapp/portlet/src/main/webapp/vue-apps/spaces-list/components/SpaceCardButton.vue b/webapp/portlet/src/main/webapp/vue-apps/spaces-list/components/SpaceCardButton.vue
new file mode 100644
index 00000000000..c913e17b79c
--- /dev/null
+++ b/webapp/portlet/src/main/webapp/vue-apps/spaces-list/components/SpaceCardButton.vue
@@ -0,0 +1,95 @@
+<!--
+
+ This file is part of the Meeds project (https://meeds.io/).
+
+ Copyright (C) 2020 - 2024 Meeds Association contact@meeds.io
+
+ This program is free software; you can redistribute it and/or
+
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 3 of the License, or (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public License
+ along with this program; if not, write to the Free Software Foundation,
+ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+-->
+<template>
+  <v-card
+    :width="iconOnly && 36 || 'auto'"
+    flat>
+    <v-tooltip :disabled="extension.title && ($root.isMobile || !iconOnly)" bottom>
+      <template #activator="{on, attrs}">
+        <v-btn
+          v-on="on"
+          v-bind="extension.href && {
+            ...(attrs || {}),
+            'href': extension.href,
+          } || attrs"
+          :aria-label="extension.title"
+          :icon="iconOnly"
+          :color="!iconOnly && 'primary'"
+          :outlined="!iconOnly"
+          :loading="extension.loading"
+          class="absolute-vertical-align z-index-one"
+          ripple
+          @touchstart.stop="0"
+          @touchend.stop="0"
+          @mousedown.stop="0"
+          @mouseup.stop="0"
+          @click.stop.prevent="() => extension?.click?.(space)">
+          <div class="d-flex align-center justify-center">
+            <v-icon
+              v-if="extension.icon"
+              :size="extension.iconSize || 20">
+              {{ extension.icon }}
+            </v-icon>
+            <span
+              v-if="!iconOnly"
+              :class="extension.icon && 'ms-2'"
+              class="text-body-font-size">
+              {{ extension.title }}
+            </span>
+          </div>
+        </v-btn>
+      </template>
+      <span>{{ extension.title }}</span>
+    </v-tooltip>
+  </v-card>
+</template>
+<script>
+export default {
+  props: {
+    extension: {
+      type: Object,
+      default: () => ({
+        icon: null,
+        iconSize: null,
+        title: null,
+        loading: false,
+        click: null,
+      }),
+    },
+    space: {
+      type: Object,
+      default: null,
+    },
+    icon: {
+      type: Boolean,
+      default: false,
+    },
+  },
+  computed: {
+    iconOnly() {
+      return this.icon || this.extension.iconOnly;
+    },
+  }
+};
+</script>
+
diff --git a/webapp/portlet/src/main/webapp/vue-apps/spaces-list/components/SpaceCardMenu.vue b/webapp/portlet/src/main/webapp/vue-apps/spaces-list/components/SpaceCardMenu.vue
new file mode 100644
index 00000000000..13fa37e5dc5
--- /dev/null
+++ b/webapp/portlet/src/main/webapp/vue-apps/spaces-list/components/SpaceCardMenu.vue
@@ -0,0 +1,403 @@
+<!--
+
+ This file is part of the Meeds project (https://meeds.io/).
+
+ Copyright (C) 2020 - 2024 Meeds Association contact@meeds.io
+
+ This program is free software; you can redistribute it and/or
+
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 3 of the License, or (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public License
+ along with this program; if not, write to the Free Software Foundation,
+ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+-->
+<template>
+  <div class="d-flex align-center">
+    <space-favorite-action
+      v-if="space.isMember"
+      :is-favorite="space.isFavorite"
+      :space-id="space.id"
+      :icon-size="20"
+      class="ms-1" />
+    <space-card-button
+      v-for="(extension, i) in spaceActionExtensions"
+      :key="i"
+      :extension="extension"
+      :space="space"
+      class="ms-1" />
+    <component
+      v-if="space.canEdit || space.isMember"
+      :is="$root.isMobile && 'v-bottom-sheet' || 'v-menu'"
+      ref="actionMenu"
+      v-model="menu"
+      :attach="$root.isMobile && '#vuetify-apps' || attachMenu"
+      :left="!$vuetify.rtl"
+      :right="$vuetify.rtl"
+      transition="slide-x-reverse-transition"
+      content-class="position-absolute application-menu z-index-modal"
+      offset-y>
+      <template #activator="{attrs}">
+        <space-card-button
+          v-bind="attrs"
+          :extension="{
+            icon: 'fa-ellipsis-v',
+            title: $t('spacesList.button.options'),
+            loading: sendingAction,
+            click: () => menu = !menu,
+          }"
+          :space="space"
+          icon />
+      </template>
+      <v-list
+        :max-width="!$root.isMobile && 300 || 'auto'"
+        :class="$root.isMobile && 'border-top-left-radius border-top-right-radius'"
+        dense>
+        <space-card-menu-item
+          v-if="$root.isMobile"
+          :href="url"
+          label="spacesList.button.openSpace"
+          icon="fa-external-link-alt" />
+        <space-card-menu-item
+          label="spacesList.button.copyLink"
+          icon="fa-link"
+          @click="copyLink" />
+        <space-card-menu-item
+          v-if="spacePublicSiteUrl"
+          :href="spacePublicSiteUrl"
+          label="spacesList.button.visitPublicSite"
+          icon="fa-globe" />
+        <space-card-menu-item
+          v-if="space.isMember"
+          label="spacesList.button.leave"
+          icon="fa-sign-out-alt"
+          @click="leaveConfirm" />
+        <template v-else-if="space.isInvited">
+          <space-card-menu-item
+            label="spacesList.button.acceptToJoin"
+            icon="fa-check"
+            icon-color="success"
+            @click="acceptToJoin" />
+          <space-card-menu-item
+            label="spacesList.button.refuseToJoin"
+            icon="fa-times"
+            icon-color="error"
+            @click="refuseToJoin" />
+        </template>
+        <space-card-menu-item
+          v-else-if="space.isPending"
+          label="spacesList.button.cancelRequest"
+          icon="fa-times"
+          icon-color="error"
+          @click="cancelRequest" />
+        <space-card-menu-item
+          v-else-if="space.subscription === 'open' && !space.isMember"
+          label="spacesList.button.join"
+          icon="fa-sign-in-alt"
+          @click="join" />
+        <space-card-menu-item
+          v-else-if="space.subscription === 'validation' && !space.isMember && !space.isPending"
+          label="spacesList.button.requestJoin"
+          icon="fa-sign-in-alt"
+          @click="requestJoin" />
+        <space-card-menu-item
+          v-if="space.canEdit"
+          :href="`${url}/settings`"
+          label="spacesList.button.openSettings"
+          icon="fa-edit" />
+        <space-card-menu-item
+          v-if="space.canEdit"
+          label="spacesList.button.remove"
+          label-color="error"
+          icon="fa-trash"
+          icon-color="error"
+          @click="removeSpaceConfirm" />
+      </v-list>
+    </component>
+    <component
+      v-else-if="space.isInvited"
+      :is="$root.isMobile && 'v-bottom-sheet' || 'v-menu'"
+      ref="actionMenu"
+      v-model="menu"
+      :attach="$root.isMobile && '#vuetify-apps' || attachMenu"
+      :left="!$vuetify.rtl"
+      :right="$vuetify.rtl"
+      transition="slide-x-reverse-transition"
+      content-class="position-absolute application-menu z-index-modal"
+      offset-y>
+      <template #activator="{attrs}">
+        <space-card-button
+          v-bind="attrs"
+          :extension="{
+            icon: 'fa fa-question warning--text',
+            title: $t('spacesList.button.answerInvitation'),
+            loading: sendingAction,
+            click: () => menu = !menu,
+          }"
+          :space="space"
+          class="mx-2" />
+      </template>
+      <v-list
+        :max-width="!$root.isMobile && 300 || 'auto'"
+        :class="$root.isMobile && 'border-top-left-radius border-top-right-radius'"
+        dense>
+        <space-card-menu-item
+          label="spacesList.button.acceptToJoin"
+          icon="fa-check"
+          icon-color="success"
+          @click="acceptToJoin" />
+        <space-card-menu-item
+          label="spacesList.button.refuseToJoin"
+          icon="fa-times"
+          icon-color="error"
+          @click="refuseToJoin" />
+      </v-list>
+    </component>
+    <space-card-button
+      v-else-if="space.isPending"
+      :extension="{
+        title: $t('spacesList.button.cancelRequest'),
+        loading: sendingAction,
+        click: cancelRequest
+      }"
+      :space="space"
+      class="mx-2" />
+    <space-card-button
+      v-else-if="space.subscription === 'open' && !space.isMember"
+      :extension="{
+        title: $t('spacesList.button.join'),
+        loading: sendingAction,
+        click: join
+      }"
+      :space="space"
+      class="mx-2" />
+    <space-card-button
+      v-else-if="space.subscription === 'validation' && !space.isMember && !space.isPending"
+      :extension="{
+        title: $t('spacesList.button.requestJoin'),
+        loading: sendingAction,
+        click: requestJoin
+      }"
+      :space="space"
+      class="mx-2" />
+    <confirm-dialog
+      v-if="confirmDialog"
+      ref="confirmDialog"
+      :title="confirmTitle"
+      :message="confirmMessage"
+      :ok-label="$t('spacesList.label.ok')"
+      :cancel-label="okMethod && $t('spacesList.label.cancel')"
+      @ok="okConfirmDialog"
+      @dialog-closed="closeConfirmDialog" />
+  </div>
+</template>
+<script>
+export default {
+  props: {
+    space: {
+      type: Object,
+      default: null,
+    },
+    spaceActionExtensions: {
+      type: Object,
+      default: null,
+    },
+  },
+  data: () => ({
+    id: Math.random(), // NOSONAR
+    sendingAction: false,
+    confirmTitle: '',
+    confirmMessage: '',
+    confirmDialog: false,
+    menu: false,
+    okMethod: null,
+  }),
+  computed: {
+    url() {
+      return `${eXo.env.portal.context}/s/${this.space.id}`;
+    },
+    spacePublicSiteUrl() {
+      return this.space.publicSiteName
+        && this.space.publicSiteVisibility !== 'manager'
+        && `${eXo.env.portal.context}/${this.space.publicSiteName}`;
+    },
+  },
+  watch: {
+    menu() {
+      // Workaround to fix closing menu when clicking outside
+      if (this.menu) {
+        document.addEventListener('mousedown', this.closeMenu);
+        this.$root.$emit('spaces-list-menu-opened', this.id);
+      } else {
+        document.removeEventListener('mousedown', this.closeMenu);
+      }
+    },
+    spaceBannerUrl() {
+      return this.space && (this.space.bannerUrl || `/portal/rest/v1/social/spaces/${this.space.prettyName}/banner`);
+    },
+  },
+  created() {
+    this.$root.$on('spaces-list-menu-opened', this.closeMenu);
+  },
+  beforeDestroy() {
+    this.$root.$off('spaces-list-menu-opened', this.closeMenu);
+    document.removeEventListener('mousedown', this.closeMenu);
+  },
+  methods: {
+    removeSpaceConfirm() {
+      this.openConfirmDialog(
+        this.$t('spacesList.title.deleteSpace'),
+        this.$t('spacesList.message.deleteSpace'),
+        this.removeSpace);
+    },
+    removeSpace() {
+      this.sendingAction = true;
+      this.$spaceService.removeSpace(this.space.id)
+        .then(() => this.$root.$emit('spaces-list-refresh'))
+        .catch((e) => {
+          // eslint-disable-next-line no-console
+          console.error('Error processing action', e);
+        })
+        .finally(() => {
+          this.sendingAction = false;
+        });
+    },
+    leaveConfirm() {
+      const isOnlyManagrLeftInSpace = this.space.isManager && this.space.managersCount <= 1;
+      if (isOnlyManagrLeftInSpace) {
+        this.openConfirmDialog(
+          this.$t('spacesList.warning'),
+          this.$t('spacesList.warning.lastManager'));
+      } else {
+        this.openConfirmDialog(
+          this.$t('spacesList.title.leaveSpace'),
+          this.$t('spacesList.message.leaveSpace', {0: `<b>${this.space.displayName}</b>`}),
+          this.leave);
+      }
+    },
+    leave() {
+      this.sendingAction = true;
+      this.$spaceService.leave(this.space.id)
+        .then(() => this.$root.$emit('spaces-list-refresh'))
+        .catch((e) => {
+          // eslint-disable-next-line no-console
+          console.error('Error processing action', e);
+        })
+        .finally(() => {
+          this.sendingAction = false;
+        });
+    },
+    acceptToJoin() {
+      this.sendingAction = true;
+      this.$spaceService.accept(this.space.id)
+        .then(() => this.$root.$emit('spaces-list-refresh'))
+        .catch((e) => {
+          // eslint-disable-next-line no-console
+          console.error('Error processing action', e);
+        })
+        .finally(() => {
+          this.sendingAction = false;
+        });
+    },
+    refuseToJoin() {
+      this.sendingAction = true;
+      this.$spaceService.deny(this.space.id)
+        .then(() => this.$root.$emit('spaces-list-refresh'))
+        .catch((e) => {
+          // eslint-disable-next-line no-console
+          console.error('Error processing action', e);
+        })
+        .finally(() => {
+          this.sendingAction = false;
+        });
+    },
+    join() {
+      this.sendingAction = true;
+      this.$spaceService.join(this.space.id)
+        .then(() => this.$root.$emit('spaces-list-refresh'))
+        .catch((e) => {
+          // eslint-disable-next-line no-console
+          console.error('Error processing action', e);
+        })
+        .finally(() => {
+          this.sendingAction = false;
+        });
+    },
+    requestJoin() {
+      this.sendingAction = true;
+      this.$spaceService.requestJoin(this.space.id)
+        .then(() => this.$root.$emit('spaces-list-refresh'))
+        .catch((e) => {
+          // eslint-disable-next-line no-console
+          console.error('Error processing action', e);
+        })
+        .finally(() => {
+          this.sendingAction = false;
+        });
+    },
+    cancelRequest() {
+      this.sendingAction = true;
+      this.$spaceService.cancel(this.space.id)
+        .then(() => this.$root.$emit('spaces-list-refresh'))
+        .catch((e) => {
+          // eslint-disable-next-line no-console
+          console.error('Error processing action', e);
+        })
+        .finally(() => {
+          this.sendingAction = false;
+        });
+    },
+    async openConfirmDialog(title, message, okMethod) {
+      this.confirmDialog = true;
+      await this.$nextTick();
+      this.confirmTitle = title;
+      this.confirmMessage = message;
+      if (okMethod) {
+        this.okMethod = okMethod;
+      } else {
+        this.okMethod = null;
+      }
+      this.$refs.confirmDialog.open();
+    },
+    okConfirmDialog() {
+      if (this.okMethod) {
+        this.okMethod();
+      }
+    },
+    closeMenu(event) {
+      if (event !== this.id) {
+        if (event?.target) {
+          window.setTimeout(() => {
+            this.menu = false;
+          }, 200);
+        } else {
+          this.menu = false;
+        }
+      }
+    },
+    copyLink() {
+      try {
+        navigator.clipboard.writeText(`${window.location.origin}${eXo.env.portal.context}/s/${this.space.id}`);
+        this.$root.$emit('alert-message', this.$t('SpaceSettings.publicSite.drawer.copyLink.success'), 'success');
+      } catch (e) {
+        this.$root.$emit('alert-message', this.$t('SpaceSettings.publicSite.drawer.copyLink.error'), 'warning');
+      }
+    },
+    closeConfirmDialog() {
+      this.confirmTitle = '';
+      this.confirmMessage = '';
+      this.okMethod = null;
+      this.confirmDialog = false;
+    },
+  },
+};
+</script>
+
diff --git a/webapp/portlet/src/main/webapp/vue-apps/spaces-list/components/SpaceCardMenuItem.vue b/webapp/portlet/src/main/webapp/vue-apps/spaces-list/components/SpaceCardMenuItem.vue
new file mode 100644
index 00000000000..db4134f84d3
--- /dev/null
+++ b/webapp/portlet/src/main/webapp/vue-apps/spaces-list/components/SpaceCardMenuItem.vue
@@ -0,0 +1,71 @@
+<!--
+
+ This file is part of the Meeds project (https://meeds.io/).
+
+ Copyright (C) 2020 - 2024 Meeds Association contact@meeds.io
+
+ This program is free software; you can redistribute it and/or
+
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 3 of the License, or (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public License
+ along with this program; if not, write to the Free Software Foundation,
+ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+-->
+<template>
+  <v-list-item
+    v-on="this.$listeners.click && {
+      click: this.$listeners.click
+    }"
+    v-bind="this.$attrs.href && {
+      href: this.$attrs.href
+    }"
+    :aria-label="$t(label)"
+    class="ps-0 py-0"
+    link>
+    <v-list-item-icon class="mx-2">
+      <v-icon
+        class="ma-auto"
+        size="18"
+        v-bind="iconColor && {
+          color: iconColor,
+        }">
+        {{ icon }}
+      </v-icon>
+    </v-list-item-icon>
+    <v-list-item-content class="d-inline">
+      <v-list-item-title :class="labelColor && `${labelColor}--text`" class="text-body">{{ $t(label) }}</v-list-item-title>
+    </v-list-item-content>
+  </v-list-item>
+</template>
+<script>
+export default {
+  props: {
+    label: {
+      type: String,
+      default: null,
+    },
+    labelColor: {
+      type: String,
+      default: null,
+    },
+    icon: {
+      type: String,
+      default: null,
+    },
+    iconColor: {
+      type: String,
+      default: null,
+    },
+  },
+};
+</script>
+
diff --git a/webapp/portlet/src/main/webapp/vue-apps/spaces-list/components/SpaceCardUnreadBadge.vue b/webapp/portlet/src/main/webapp/vue-apps/spaces-list/components/SpaceCardUnreadBadge.vue
new file mode 100644
index 00000000000..94d6bfd48bb
--- /dev/null
+++ b/webapp/portlet/src/main/webapp/vue-apps/spaces-list/components/SpaceCardUnreadBadge.vue
@@ -0,0 +1,90 @@
+<!--
+
+ This file is part of the Meeds project (https://meeds.io/).
+
+ Copyright (C) 2020 - 2024 Meeds Association contact@meeds.io
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 3 of the License, or (at your option) any later version.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public License
+ along with this program; if not, write to the Free Software Foundation,
+ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+-->
+<template>
+  <v-tooltip
+    v-if="hasUnreadBadge"
+    :disabled="$root.isMobile"
+    top>
+    <template #activator="{on, attrs}">
+      <v-card
+        v-bind="attrs"
+        v-on="on"
+        :class="$vuetify.rtl && 'l-0' || 'r-0'"
+        transition="scale-transition"
+        class="unread-badge border-radius-circle error-color-background position-absolute z-index-two mt-n2 me-n2"
+        min-width="16"
+        min-height="16"
+        width="16"
+        height="16"
+        flat />
+    </template>
+    <span>{{ $t('spacesList.button.unreadActivities') }}</span>
+  </v-tooltip>
+</template>
+<script>
+export default {
+  props: {
+    space: {
+      type: Object,
+      default: null,
+    }
+  },
+  data: () => ({
+    unread: null,
+  }),
+  computed: {
+    spaceId() {
+      return this.space?.id;
+    },
+    hasUnreadBadge() {
+      return this.unread === null ? !!this.$root.unreadPerSpace?.[this.spaceId] : !!this.unread;
+    },
+  },
+  mounted() {
+    document.addEventListener('notification.unread.item', this.handleUpdatesFromWebSocket);
+    document.addEventListener('notification.read.item', this.handleUpdatesFromWebSocket);
+    document.addEventListener('notification.read.allItems', this.handleUpdatesFromWebSocket);
+  },
+  beforeDestroy() {
+    document.removeEventListener('notification.unread.item', this.handleUpdatesFromWebSocket);
+    document.removeEventListener('notification.read.item', this.handleUpdatesFromWebSocket);
+    document.removeEventListener('notification.read.allItems', this.handleUpdatesFromWebSocket);
+  },
+  methods: {
+    handleUpdatesFromWebSocket(event) {
+      const data = event?.detail;
+      const wsEventName = data?.wsEventName || '';
+      let spaceWebNotificationItem = data?.message?.spaceWebNotificationItem || data?.message?.spacewebnotificationitem;
+      if (spaceWebNotificationItem?.length) {
+        spaceWebNotificationItem = JSON.parse(spaceWebNotificationItem);
+      }
+      const spaceId = spaceWebNotificationItem?.spaceId;
+      if (wsEventName === 'notification.unread.item' && Number(spaceId) === Number(this.spaceId)) {
+        this.unread = true;
+      }  else if (wsEventName === 'notification.read.item' && Number(spaceId) === Number(this.spaceId)) {
+        this.unread = false;
+      }  else if (wsEventName === 'notification.read.allItems') {
+        this.unread = false;
+      }
+    }
+  }
+};
+</script>
diff --git a/webapp/portlet/src/main/webapp/vue-apps/spaces-list/components/ExoSpaceFavoriteAction.vue b/webapp/portlet/src/main/webapp/vue-apps/spaces-list/components/SpaceFavoriteAction.vue
similarity index 68%
rename from webapp/portlet/src/main/webapp/vue-apps/spaces-list/components/ExoSpaceFavoriteAction.vue
rename to webapp/portlet/src/main/webapp/vue-apps/spaces-list/components/SpaceFavoriteAction.vue
index 1e5bce988d7..ce6acc7ad79 100644
--- a/webapp/portlet/src/main/webapp/vue-apps/spaces-list/components/ExoSpaceFavoriteAction.vue
+++ b/webapp/portlet/src/main/webapp/vue-apps/spaces-list/components/SpaceFavoriteAction.vue
@@ -1,3 +1,25 @@
+<!--
+
+ This file is part of the Meeds project (https://meeds.io/).
+
+ Copyright (C) 2020 - 2024 Meeds Association contact@meeds.io
+
+ This program is free software; you can redistribute it and/or
+
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 3 of the License, or (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public License
+ along with this program; if not, write to the Free Software Foundation,
+ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+-->
 <template>
   <favorite-button
     :id="spaceId"
@@ -6,12 +28,13 @@
     :absolute="absolute"
     :top="top"
     :right="right"
-    :small="false"
-    type="space"
-    type-label="space"
     :entity-type="entityType"
     :display-label="displayLabel"
     :extra-class="extraClass"
+    :icon-size="iconSize"
+    :small="false"
+    type="space"
+    type-label="space"
     @removed="removed"
     @remove-error="removeError"
     @added="added"
@@ -53,6 +76,10 @@ export default {
       type: String,
       default: () => '',
     },
+    iconSize: {
+      type: Number,
+      default: () => 16,
+    },
   },
   data: () => ({
     favorite: false
diff --git a/webapp/portlet/src/main/webapp/vue-apps/spaces-list/components/ExoSpaceFormDrawer.vue b/webapp/portlet/src/main/webapp/vue-apps/spaces-list/components/SpaceFormDrawer.vue
similarity index 93%
rename from webapp/portlet/src/main/webapp/vue-apps/spaces-list/components/ExoSpaceFormDrawer.vue
rename to webapp/portlet/src/main/webapp/vue-apps/spaces-list/components/SpaceFormDrawer.vue
index aee4fe0920f..77eb18f9c7b 100644
--- a/webapp/portlet/src/main/webapp/vue-apps/spaces-list/components/ExoSpaceFormDrawer.vue
+++ b/webapp/portlet/src/main/webapp/vue-apps/spaces-list/components/SpaceFormDrawer.vue
@@ -1,3 +1,25 @@
+<!--
+
+ This file is part of the Meeds project (https://meeds.io/).
+
+ Copyright (C) 2020 - 2024 Meeds Association contact@meeds.io
+
+ This program is free software; you can redistribute it and/or
+
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 3 of the License, or (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public License
+ along with this program; if not, write to the Free Software Foundation,
+ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+-->
 <template>
   <exo-drawer
     ref="spaceFormDrawer"
@@ -32,6 +54,7 @@
               <input
                 ref="autoFocusInput1"
                 v-model="space.displayName"
+                :aria-label="$t('spacesList.label.displayName')"
                 :placeholder="$t('spacesList.label.displayName')"
                 type="text"
                 name="name"
@@ -54,6 +77,7 @@
               </v-label>
               <select
                 v-model="template"
+                :aria-label="$t('spacesList.label.spaceTemplate')"
                 :disabled="space && space.id"
                 name="spaceTemplate"
                 class="input-block-level ignore-vuetify-classes my-3"
@@ -346,7 +370,7 @@ export default {
         visibility: 'private',
       };
       this.setSpaceTemplateProperties();
-      this.title= this.$t('spacesList.label.addNewSpace');
+      this.title = this.$t('spacesList.label.addNewSpace');
       this.$refs.spaceFormDrawer.open();
     });
     document.addEventListener('meeds.social.editSpace', this.editSpace);
@@ -384,7 +408,7 @@ export default {
       this.spaceToUpdate = space;
       this.space = Object.assign({}, space);
       this.template = this.space.template || this.template;
-      this.title= this.$t('spacesList.label.editSpace', { 0: this.space.displayName });
+      this.title = this.$t('spacesList.label.editSpace', { 0: this.space.displayName });
       this.$refs.spaceFormDrawer.open();
     },
     previousStep() {
diff --git a/webapp/portlet/src/main/webapp/vue-apps/spaces-list/components/SpacePendingButton.vue b/webapp/portlet/src/main/webapp/vue-apps/spaces-list/components/SpacePendingButton.vue
new file mode 100644
index 00000000000..09772e26a7f
--- /dev/null
+++ b/webapp/portlet/src/main/webapp/vue-apps/spaces-list/components/SpacePendingButton.vue
@@ -0,0 +1,106 @@
+<!--
+
+ This file is part of the Meeds project (https://meeds.io/).
+
+ Copyright (C) 2020 - 2024 Meeds Association contact@meeds.io
+
+ This program is free software; you can redistribute it and/or
+
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 3 of the License, or (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public License
+ along with this program; if not, write to the Free Software Foundation,
+ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+-->
+<template>
+  <v-tooltip
+    :disabled="$root.isMobile"
+    transition="scale-transition"
+    bottom>
+    <template #activator="{on, attrs}">
+      <v-btn
+        :id="`${filter}SpacesButton`"
+        v-on="on"
+        v-bind="attrs"
+        :aria-label="$t(labelKey, {0: count})"
+        :class="{
+          'primary-border-color' : isSelected,
+          'border-color-transparent' : !isSelected,
+        }"
+        class="ms-2"
+        height="36"
+        width="36"
+        icon
+        @click="apply">
+        <v-icon
+          :class="iconClass"
+          size="20"
+          dark>
+          {{ icon }}
+        </v-icon>
+        <v-card
+          :class="badgeColor"
+          class="d-flex align-center justify-center aspect-ratio-1 border-radius-circle position-absolute t-0 r-0 mt-n2 me-n2 text-subtitle-font-size line-height-normal"
+          height="24"
+          width="24"
+          dark
+          flat>
+          {{ count > 9 ? '+9' : count }}
+        </v-card>
+      </v-btn>
+    </template>
+    <span>{{ $t(labelKey, {0: count}) }}</span>
+  </v-tooltip>
+</template>
+<script>
+export default {
+  props: {
+    count: {
+      type: Number,
+      default: () => 0,
+    },
+    filter: {
+      type: String,
+      default: null,
+    },
+    icon: {
+      type: String,
+      default: null,
+    },
+    iconClass: {
+      type: String,
+      default: null,
+    },
+    labelKey: {
+      type: String,
+      default: null,
+    },
+    badgeColor: {
+      type: String,
+      default: null,
+    },
+  },
+  computed: {
+    isSelected() {
+      return this.$root.filter === this.filter;
+    }
+  },
+  methods: {
+    apply() {
+      if (this.filter === 'requests') {
+        this.$root.$emit('space-list-pending-open', this.count);
+      } else {
+        this.$root.$emit('spaces-list-filter-update', this.isSelected ? 'all' : this.filter);
+      }
+    },
+  },
+};
+</script>
\ No newline at end of file
diff --git a/webapp/portlet/src/main/webapp/vue-apps/spaces-list/components/SpacePendingDrawer.vue b/webapp/portlet/src/main/webapp/vue-apps/spaces-list/components/SpacePendingDrawer.vue
new file mode 100644
index 00000000000..9733df5d1b9
--- /dev/null
+++ b/webapp/portlet/src/main/webapp/vue-apps/spaces-list/components/SpacePendingDrawer.vue
@@ -0,0 +1,187 @@
+<!--
+
+  This file is part of the Meeds project (https://meeds.io/).
+
+  Copyright (C) 2020 - 2024 Meeds Association contact@meeds.io
+
+  This program is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 3 of the License, or (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public License
+  along with this program; if not, write to the Free Software Foundation,
+  Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+-->
+<template>
+  <exo-drawer
+    id="spacePendingUsersDrawer"
+    ref="drawer"
+    v-model="drawer"
+    :loading="loading"
+    :right="!$vuetify.rtl"
+    allow-expand
+    no-x-scroll>
+    <template #title>
+      {{ $t('spacesList.pending.drawer.title') }}
+    </template>
+    <template v-if="drawer" #content>
+      <div v-if="memberships?.length" class="pa-5">
+        <span class="mb-2">
+          {{ $t('spacesList.label.pendingRequests.description') }}
+        </span>
+        <spaces-role-list
+          :memberships="memberships"
+          approve-button
+          display-date
+          @approve="acceptUserRequest"
+          @remove="denyUserRequest" />
+      </div>
+      <div v-else-if="!loading" class="d-flex flex-column align-center justify-center py-8">
+        <v-icon size="54" color="secondary">fa-history</v-icon>
+        <span class="my-4">{{ $t('spacesList.pending.placeholder.emptyRequests') }}</span>
+        <v-btn
+          class="btn"
+          elevation="0"
+          @click="close">
+          {{ $t('spacesList.pending.placeholder.close') }}
+        </v-btn>
+      </div>
+    </template>
+    <template v-if="hasMore" #footer>
+      <div class="d-flex">
+        <v-btn
+          :loading="loading"
+          class="btn me-2"
+          block
+          @click="loadMore">
+          <template>
+            {{ $t('spacesList.pending.loadMore') }}
+          </template>
+        </v-btn>
+      </div>
+    </template>
+  </exo-drawer>
+</template>
+<script>
+export default {
+  data: () => ({
+    drawer: false,
+    loading: false,
+    filterType: 'requests',
+    pageSize: 0,
+    limit: 0,
+    memberSpaces: null,
+    visitedSpaces: null,
+    activeSpaces: null,
+    hasMore: false,
+    memberships: null,
+    page: 0,
+    size: 0,
+    pendingUsersCount: 0,
+  }),
+  watch: {
+    filterType() {
+      this.reset();
+      this.refreshMemberships();
+    },
+  },
+  created() {
+    this.$root.$on('space-list-pending-open', this.open);
+  },
+  beforeDestroy() {
+    this.$root.$off('space-list-pending-open', this.open);
+  },
+  methods: {
+    open(pendingUsersCount, filterType) {
+      this.filterType = filterType || 'requests';
+      this.pendingUsersCount = pendingUsersCount;
+      this.reset();
+      this.getSpaceMemberships();
+      this.$refs.drawer.open();
+    },
+    reset() {
+      this.pageSize = parseInt((window.innerHeight - 180) / 56);
+      this.page = 0;
+      this.size = 0;
+      this.memberships = [];
+      this.loading = false;
+      this.hasMore = false;
+    },
+    refreshMemberships() {
+      if (this.drawer) {
+        this.getSpaceMemberships(true);
+      }
+    },
+    loadMore() {
+      this.page++;
+      this.getSpaceMemberships();
+    },
+    async getSpaceMemberships(reset) {
+      this.loading = true;
+      try {
+        const data = await this.$spaceService.getSpaces(
+          null,
+          reset ? 0 : this.page * this.pageSize,
+          reset ? (this.page + 1) * this.pageSize + 1 : this.pageSize + 1,
+          this.filterType);
+        const memberships = data?.spaces?.filter?.(space => space?.pending?.length)?.
+          flatMap?.(space => space.pending.map(user => ({
+            user,
+            space,
+          })));
+        if (memberships?.length) {
+          if (reset) {
+            this.memberships = memberships.slice(0, this.pageSize);
+          } else {
+            this.memberships.push(...memberships.slice(0, this.pageSize));
+          }
+          this.hasMore = memberships.length > this.pageSize;
+        } else {
+          if (reset) {
+            this.memberships = [];
+          }
+          this.hasMore = false;
+        }
+      } finally {
+        this.loading = false;
+      }
+    },
+    close() {
+      this.$refs.drawer.close();
+    },
+    async acceptUserRequest(membership) {
+      this.loading = true;
+      try {
+        await this.$spaceService.acceptUserRequest(membership.space.id, membership.user.username);
+        this.memberships.splice(this.memberships.indexOf(membership), 1);
+        this.$root.$emit('alert-message', this.$t('spacesList.pending.userAddedAsSpaceMember'), 'success');
+        this.$root.$emit('space-list-pending-updated');
+      } catch (e) {
+        this.$root.$emit('alert-message', this.$t('spacesList.pending.error.unknownErrorWhenSavingRoles'), 'error');
+      } finally {
+        this.loading = false;
+      }
+    },
+    async denyUserRequest(membership) {
+      this.loading = true;
+      try {
+        await this.$spaceService.refuseUserRequest(membership.space.id, membership.user.username);
+        this.memberships.splice(this.memberships.indexOf(membership), 1);
+        this.$root.$emit('alert-message', this.$t('spacesList.pending.userRequestDenied'), 'success');
+        this.$root.$emit('space-list-pending-updated');
+      } catch (e) {
+        this.$root.$emit('alert-message', this.$t('spacesList.pending.error.unknownErrorWhenSavingRoles'), 'error');
+      } finally {
+        this.loading = false;
+      }
+    },
+  }
+};
+</script>
diff --git a/webapp/portlet/src/main/webapp/vue-apps/spaces-list/components/SpaceRoleList.vue b/webapp/portlet/src/main/webapp/vue-apps/spaces-list/components/SpaceRoleList.vue
new file mode 100644
index 00000000000..ecb2523a948
--- /dev/null
+++ b/webapp/portlet/src/main/webapp/vue-apps/spaces-list/components/SpaceRoleList.vue
@@ -0,0 +1,51 @@
+<!--
+
+ This file is part of the Meeds project (https://meeds.io/).
+
+ Copyright (C) 2020 - 2024 Meeds Association contact@meeds.io
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 3 of the License, or (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public License
+ along with this program; if not, write to the Free Software Foundation,
+ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+-->
+<template>
+  <v-list v-if="memberships?.length" dense>
+    <spaces-role-list-item
+      v-for="m in memberships"
+      :key="m.id"
+      :membership="m"
+      :approve-button="approveButton"
+      :display-date="displayDate"
+      @approve="$emit('approve', m)"
+      @remove="$emit('remove', m)" />
+  </v-list>
+</template>
+<script>
+export default {
+  props: {
+    memberships: {
+      type: Array,
+      default: null,
+    },
+    approveButton: {
+      type: Boolean,
+      default: false,
+    },
+    displayDate: {
+      type: Boolean,
+      default: false,
+    },
+  },
+};
+</script>
\ No newline at end of file
diff --git a/webapp/portlet/src/main/webapp/vue-apps/spaces-list/components/SpaceRoleListItem.vue b/webapp/portlet/src/main/webapp/vue-apps/spaces-list/components/SpaceRoleListItem.vue
new file mode 100644
index 00000000000..89e9fd7b8a4
--- /dev/null
+++ b/webapp/portlet/src/main/webapp/vue-apps/spaces-list/components/SpaceRoleListItem.vue
@@ -0,0 +1,109 @@
+<!--
+
+ This file is part of the Meeds project (https://meeds.io/).
+
+ Copyright (C) 2020 - 2024 Meeds Association contact@meeds.io
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 3 of the License, or (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public License
+ along with this program; if not, write to the Free Software Foundation,
+ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+-->
+<template>
+  <v-list-item class="text-truncate px-0 py-1">
+    <exo-space-avatar
+      :space="space"
+      :size="36"
+      extra-class="text-truncate"
+      avatar />
+    <exo-user-avatar
+      :identity="user"
+      :size="30"
+      extra-class="text-truncate ms-n6 mt-6"
+      avatar />
+    <v-list-item-content class="py-0 accountTitleLabel text-truncate">
+      <v-list-item-title class="font-weight-bold mt-2">
+        <exo-space-avatar
+          :space="space"
+          extra-class="text-truncate"
+          fullname />
+      </v-list-item-title>
+      <v-list-item-subtitle class="d-flex flex-row flex-nowrap">
+        <exo-user-avatar
+          :identity="user"
+          extra-class="text-truncate ms-2 me-1"
+          fullname />
+      </v-list-item-subtitle>
+    </v-list-item-content>
+    <v-list-item-action v-if="approveButton" class="mx-0">
+      <v-btn
+        :title="$t('SpaceSettings.roles.acceptRequest')"
+        small
+        icon
+        @click="$emit('approve')">
+        <v-icon size="18" color="success">fa-check</v-icon>
+      </v-btn>
+    </v-list-item-action>
+    <v-list-item-action class="ms-2">
+      <v-btn
+        :title="approveButton && $t('SpaceSettings.roles.rejectRequest') || $t('SpaceSettings.roles.delete')"
+        small
+        icon
+        @click="$emit('remove')">
+        <v-icon size="18" color="error">{{ approveButton && 'fa-times' || 'fa-trash' }}</v-icon>
+      </v-btn>
+    </v-list-item-action>
+  </v-list-item>
+</template>
+<script>
+export default {
+  props: {
+    membership: {
+      type: Object,
+      default: null,
+    },
+    approveButton: {
+      type: Boolean,
+      default: false,
+    },
+    displayDate: {
+      type: Boolean,
+      default: false,
+    },
+  },
+  data: () => ({
+    format: {
+      year: 'numeric',
+      month: 'short',
+      day: 'numeric',
+    },
+  }),
+  computed: {
+    user() {
+      return this.membership.user;
+    },
+    space() {
+      return this.membership.space;
+    },
+    avatar() {
+      return this.user.avatar || this.user.profile?.avatarUrl;
+    },
+    fullName() {
+      return this.user.fullname || this.user.profile?.fullName;
+    },
+    position() {
+      return this.user.position || this.user.profile?.position;
+    },
+  }
+};
+</script>
\ No newline at end of file
diff --git a/webapp/portlet/src/main/webapp/vue-apps/spaces-list/components/SpacesCardList.vue b/webapp/portlet/src/main/webapp/vue-apps/spaces-list/components/SpacesCardList.vue
new file mode 100644
index 00000000000..17479f3e09d
--- /dev/null
+++ b/webapp/portlet/src/main/webapp/vue-apps/spaces-list/components/SpacesCardList.vue
@@ -0,0 +1,250 @@
+<!--
+
+ This file is part of the Meeds project (https://meeds.io/).
+
+ Copyright (C) 2020 - 2024 Meeds Association contact@meeds.io
+
+ This program is free software; you can redistribute it and/or
+
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 3 of the License, or (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public License
+ along with this program; if not, write to the Free Software Foundation,
+ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+-->
+<template>
+  <v-card
+    class="d-flex flex-column"
+    min-height="calc(var(--100vh, 100vh) - 180px)"
+    flat>
+    <v-card
+      class="position-relative px-2 overflow-hidden"
+      height="8"
+      flat>
+      <v-progress-linear
+        v-if="loadingSpaces"
+        class="position-absolute"
+        color="primary"
+        indeterminate
+        height="2" />
+    </v-card>
+    <div id="spacesListBody" class="flex-grow-1 flex-shrink-1 pt-2">
+      <div
+        v-if="filteredSpaces && filteredSpaces.length"
+        class="d-flex flex-wrap border-box-sizing">
+        <space-card
+          v-for="space in filteredSpaces"
+          :key="space.id"
+          :space="space"
+          :space-action-extensions="spaceActionExtensions"
+          :style="cardFlexBasis && `flex-basis: ${cardFlexBasis}`"
+          :height="cardHeight"
+          :min-height="cardHeight"
+          :display-members-count="displayMembersCount"
+          max-width="100%"
+          class="mx-2 mb-4 flex-grow-0 flex-shrink-0 pa-0" />
+      </div>
+      <v-card
+        v-else-if="!loadingSpaces"
+        min-height="calc(var(--100vh, 100vh) - 280px)"
+        class="d-flex text-center noSpacesYetBlock"
+        flat>
+        <div class="ma-auto noSpacesYet">
+          <p class="noSpacesYetIcons">
+            <v-icon class="fa-9x">fa-chevron-left</v-icon>
+            <v-icon class="fa-9x">fa-chevron-right</v-icon>
+          </p>
+          <template v-if="hasSpaces">
+            <p class="text-title">
+              {{ $t('spacesList.label.noResults') }}
+            </p>
+          </template>
+          <template v-else>
+            <p class="text-title">
+              {{ $t('spacesList.label.noSpacesYet') }}
+            </p>
+            <div>
+              {{ $t('spacesList.label.noSpacesYetDescription1') }}
+            </div>
+            <span>
+              {{ $t('spacesList.label.noSpacesYetDescription2') }}
+              <v-btn
+                link
+                text
+                class="primary--text px-0 pb-1 addNewSpaceLink"
+                @click="$root.$emit('addNewSpace')">
+                {{ $t('spacesList.label.noSpacesLink') }}
+              </v-btn>
+            </span>
+          </template>
+        </div>
+      </v-card>
+    </div>
+    <div id="spacesListFooter" class="flex-grow-0 flex-shrink-0 pb-5 border-box-sizing px-2">
+      <v-btn
+        v-if="canShowMore"
+        :loading="loadingSpaces"
+        :disabled="loadingSpaces"
+        class="loadMoreButton border-color elevation-0 ma-auto"
+        block
+        @click="loadNextPage">
+        {{ $t('spacesList.button.showMore') }}
+      </v-btn>
+    </div>
+  </v-card>
+</template>
+<script>
+export default {
+  props: {
+    keyword: {
+      type: String,
+      default: null,
+    },
+    filter: {
+      type: String,
+      default: null,
+    },
+    spacesSize: {
+      type: Number,
+      default: 0,
+    },
+    loadingSpaces: {
+      type: Boolean,
+      default: false,
+    },
+  },
+  data: () => ({
+    spaceActionExtensions: [],
+    resizeObserver: null,
+    initialized: false,
+    hasSpaces: false,
+    offset: 0,
+    pageSize: 12,
+    limit: 12,
+    spaces: [],
+    limitToFetch: 0,
+    originalLimitToFetch: 0,
+    cardXSpacing: 16 + 2, // margin left/right + border left/right
+    cardsListWidth: 0, // computed
+    cardHeightDesktop: 229,
+    cardHeightMobile: 140,
+  }),
+  computed: {
+    canShowMore() {
+      return this.loadingSpaces || this.spaces.length >= this.limitToFetch;
+    },
+    cardHeight() {
+      return !this.$root.isMobile && this.cardHeightDesktop || this.cardHeightMobile;
+    },
+    cardMinWidthBase() {
+      if (this.cardsListWidth > 800) {
+        return 320;
+      } else if (this.cardsListWidth < 480) {
+        return this.cardsListWidth - this.cardXSpacing;
+      } else {
+        return 280;
+      }
+    },
+    cardPerLine() {
+      return this.cardsListWidth && parseInt((this.cardsListWidth + 8) / (this.cardMinWidthBase + this.cardXSpacing));
+    },
+    cardFlexBasis() {
+      return this.cardsListWidth && `calc(${String(100 / this.cardPerLine).substring(0, 12)}% - ${this.cardXSpacing - 2}px)`;
+    },
+    cardWidth() {
+      return parseInt(this.cardsListWidth / this.cardPerLine) + this.cardXSpacing + 2;
+    },
+    displayMembersCount() {
+      return this.cardWidth > 280;
+    },
+    filteredSpaces() {
+      if (!this.keyword || !this.loadingSpaces) {
+        return this.spaces;
+      } else {
+        return this.spaces.slice().filter(space => space.displayName && space.displayName.toLowerCase().indexOf(this.keyword.toLowerCase()) >= 0
+            || space.description && space.description.toLowerCase().indexOf(this.keyword.toLowerCase()) >= 0 );
+      }
+    },
+  },
+  watch: {
+    keyword() {
+      if (this.initialized) {
+        this.searchSpaces();
+      }
+    },
+    limitToFetch() {
+      if (this.initialized) {
+        this.searchSpaces();
+      }
+    },
+    filter() {
+      if (this.initialized) {
+        this.searchSpaces();
+      }
+    },
+  }, 
+  created() {
+    this.originalLimitToFetch = this.limitToFetch = this.limit;
+
+    document.addEventListener('extension-profile-extension-action-updated', this.refreshExtensions);
+    this.$root.$on('spaces-list-refresh', this.searchSpaces);
+    this.refreshExtensions();
+    this.searchSpaces();
+  },
+  mounted() {
+    this.resizeObserver = new ResizeObserver(this.computeWidth);
+    this.resizeObserver.observe(this.$el);
+    this.computeWidth();
+    this.refreshUnreadSpaces();
+  },
+  beforeDestroy() {
+    document.removeEventListener('extension-profile-extension-action-updated', this.refreshExtensions);
+    this.$root.$off('spaces-list-refresh', this.searchSpaces);
+    this.resizeObserver?.disconnect?.();
+  },
+  methods: {
+    computeWidth() {
+      this.cardsListWidth = this.$el?.offsetWidth - 40;
+    },
+    refreshExtensions() {
+      this.spaceActionExtensions = extensionRegistry.loadExtensions('profile-extension', 'action') || [];
+    },
+    refreshUnreadSpaces() {
+      return this.$spaceService.getSpaces(null, 0, 0, 'member', 'unread')
+        .then(data => this.$root.unreadPerSpace = data?.unreadPerSpace);
+    },
+    searchSpaces() {
+      this.$emit('loading-spaces', true);
+      const expand = this.filter === 'requests' ? 'pending,favorite' : 'managers,favorite';
+      return this.$spaceService.getSpaces(this.keyword, this.offset, this.limitToFetch, this.filter, expand)
+        .then(data => {
+          this.spaces = data && data.spaces || [];
+          this.hasSpaces = this.hasSpaces || this.spacesSize > 0;
+          this.$emit('loaded', data?.size || 0);
+          return this.$nextTick();
+        })
+        .then(() => {
+          if (this.keyword && this.filteredSpaces.length < this.originalLimitToFetch && this.spaces.length >= this.limitToFetch) {
+            this.limitToFetch += this.pageSize;
+          }
+        })
+        .finally(() => {
+          this.$emit('loading-spaces', false);
+          this.initialized = true;
+        });
+    },
+    loadNextPage() {
+      this.originalLimitToFetch = this.limitToFetch += this.pageSize;
+    },
+  }
+};
+</script>
+
diff --git a/webapp/portlet/src/main/webapp/vue-apps/spaces-list/components/SpacesList.vue b/webapp/portlet/src/main/webapp/vue-apps/spaces-list/components/SpacesList.vue
new file mode 100644
index 00000000000..a20157a0c00
--- /dev/null
+++ b/webapp/portlet/src/main/webapp/vue-apps/spaces-list/components/SpacesList.vue
@@ -0,0 +1,86 @@
+<!--
+
+ This file is part of the Meeds project (https://meeds.io/).
+
+ Copyright (C) 2020 - 2024 Meeds Association contact@meeds.io
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 3 of the License, or (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public License
+ along with this program; if not, write to the Free Software Foundation,
+ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+-->
+<template>
+  <v-app>
+    <v-main class="application-body">
+      <spaces-toolbar
+        :filter="filter"
+        :filter-message="$t('spacesList.label.spacesSize', {0: spacesSize})"
+        :filters-count="filtersCount"
+        :can-create-space="canCreateSpace"
+        compact-display
+        @keyword-changed="keyword = $event"
+        @loading="loadingSpaces = loadingSpaces || $event" />
+      <spaces-card-list
+        ref="spacesList"
+        :keyword="keyword"
+        :filter="filter"
+        :loading-spaces="loadingSpaces"
+        :spaces-size="spacesSize"
+        class="px-3"
+        @loading-spaces="loadingSpaces = $event"
+        @loaded="spacesLoaded" />
+    </v-main>
+    <spaces-list-filter-drawer />
+    <space-form-drawer />
+    <spaces-pending-drawer />
+  </v-app>    
+</template>
+<script>
+export default {
+  props: {
+    canCreateSpace: {
+      type: Boolean,
+      default: false,
+    },
+    filter: {
+      type: String,
+      default: null,
+    },
+    appId: {
+      type: String,
+      default: null,
+    },
+  },
+  data: () => ({
+    keyword: null,
+    spacesSize: 0,
+    loadingSpaces: false,
+    initialized: false,
+  }),
+  computed: {
+    filtersCount() {
+      return this.filter !== 'all' ? 1 : 0;
+    },
+  },
+  methods: {
+    spacesLoaded(spacesSize) {
+      this.spacesSize = spacesSize;
+      if (!this.initialized) {
+        this.$root.$applicationLoaded();
+        this.initialized = true;
+      }
+    }
+  },
+};
+</script>
+
diff --git a/webapp/portlet/src/main/webapp/vue-apps/spaces-list/components/SpacesListFilterDrawer.vue b/webapp/portlet/src/main/webapp/vue-apps/spaces-list/components/SpacesListFilterDrawer.vue
new file mode 100644
index 00000000000..b0593366aba
--- /dev/null
+++ b/webapp/portlet/src/main/webapp/vue-apps/spaces-list/components/SpacesListFilterDrawer.vue
@@ -0,0 +1,128 @@
+<!--
+
+ This file is part of the Meeds project (https://meeds.io/).
+
+ Copyright (C) 2020 - 2024 Meeds Association contact@meeds.io
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 3 of the License, or (at your option) any later version.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public License
+ along with this program; if not, write to the Free Software Foundation,
+ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+-->
+<template>
+  <exo-drawer
+    id="SpacesListFilterDrawer"
+    ref="drawer"
+    v-model="drawer"
+    allow-expand
+    right>
+    <template #title>
+      {{ $t('spaceList.advanced.filter.drawer.title') }}
+    </template>
+    <template v-if="drawer" #content>
+      <div class="d-flex flex-column">
+        <div class="text-header mx-4 mt-4">
+          {{ $t('spaceList.advanced.filter.spaceType.label') }}
+        </div>
+        <v-radio-group
+          v-model="filter"
+          class="mt-2 ms-3"
+          mandatory
+          inset>
+          <v-radio
+            v-for="spaceFilter in spaceFilters"
+            :key="spaceFilter.value"
+            :value="spaceFilter.value"
+            class="mt-0">
+            <template #label>
+              <div class="text-body">
+                {{ spaceFilter.text }}
+              </div>
+            </template>
+          </v-radio>
+        </v-radio-group>
+      </div>
+    </template>
+    <template #footer>
+      <div class="d-flex">
+        <v-btn
+          class="btn ms-auto me-2"
+          @click="close">
+          {{ $t('spacesList.label.cancel') }}
+        </v-btn>
+        <v-btn
+          color="primary"
+          elevation="0"
+          @click="apply">
+          {{ $t('spacesList.label.apply') }}
+        </v-btn>
+      </div>
+    </template>
+  </exo-drawer>
+</template>
+<script>
+export default {
+  data: () => ({
+    drawer: false,
+    filter: null,
+  }),
+  computed: {
+    spaceFilters() {
+      const spaceFilters = [{
+        text: this.$t('spacesList.filter.all'),
+        value: 'all',
+      },{
+        text: this.$t('spacesList.filter.userSpaces'),
+        value: 'member',
+      },{
+        text: this.$t('spacesList.filter.managingSpaces'),
+        value: 'manager',
+      },{
+        text: this.$t('spacesList.filter.favoriteSpaces'),
+        value: 'favorite',
+      }];
+      if (this.$root.invitationsCount) {
+        spaceFilters.push({
+          text: this.$t('spacesList.filter.invitedSpaces'),
+          value: 'invited',
+        });
+      }
+      if (this.$root.pendingCount) {
+        spaceFilters.push({
+          text: this.$t('spacesList.filter.pendingSpaces'),
+          value: 'pending',
+        });
+      }
+      return spaceFilters;
+    },
+  },
+  created() {
+    this.$root.$on('spaces-list-filter-open', this.open);
+  },
+  beforeDestroy() {
+    this.$root.$off('spaces-list-filter-open', this.open);
+  },
+  methods: {
+    open(filter) {
+      this.filter = filter;
+      this.$refs.drawer.open();
+    },
+    close() {
+      this.$refs.drawer.close();
+    },
+    apply() {
+      this.$root.$emit('spaces-list-filter-update', this.filter);
+      this.close();
+    },
+  },
+};
+</script>
\ No newline at end of file
diff --git a/webapp/portlet/src/main/webapp/vue-apps/spaces-list/components/SpacesToolbar.vue b/webapp/portlet/src/main/webapp/vue-apps/spaces-list/components/SpacesToolbar.vue
new file mode 100644
index 00000000000..e97d4f0eb82
--- /dev/null
+++ b/webapp/portlet/src/main/webapp/vue-apps/spaces-list/components/SpacesToolbar.vue
@@ -0,0 +1,149 @@
+<!--
+
+ This file is part of the Meeds project (https://meeds.io/).
+
+ Copyright (C) 2020 - 2024 Meeds Association contact@meeds.io
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 3 of the License, or (at your option) any later version.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public License
+ along with this program; if not, write to the Free Software Foundation,
+ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+-->
+<template>
+  <application-toolbar
+    id="spacesListToolbar"
+    :right-text-filter="{
+      minCharacters: 3,
+      placeholder: $t('spacesList.label.filterSpaces'),
+      tooltip: $t('spacesList.label.filterSpaces')
+    }"
+    :right-filter-button="{
+      text: $t('spaceList.advanced.filter.button.title'),
+      displayText: !$root.isMobile,
+    }"
+    :compact="compactDisplay || $root.isMobile"
+    :filters-count="filtersCount"
+    no-text-truncate
+    class="px-1"
+    @filter-text-input-end-typing="$emit('keyword-changed', $event)"
+    @filter-button-click="$root.$emit('spaces-list-filter-open', filter)"
+    @loading="$emit('loading', $event)">
+    <template #left>
+      <div class="d-flex align-center">
+        <v-btn
+          v-if="canCreateSpace" 
+          id="addNewSpaceButton"
+          :small="$root.isMobile"
+          color="primary"
+          elevation="0"
+          @click="$root.$emit('addNewSpace')">
+          <v-icon size="18" dark>fa-plus</v-icon>
+          <span class="ms-2 hidden-xs-only">
+            {{ $t('spacesList.button.add') }}
+          </span>
+        </v-btn>
+        <space-pending-button
+          v-if="$root.requestsCount"
+          :count="$root.requestsCount"
+          filter="requests"
+          label-key="spacesList.label.pendingRequests"
+          icon="fa-user-clock"
+          badge-color="error-color-background" />
+        <space-pending-button
+          v-if="$root.invitationsCount"
+          :count="$root.invitationsCount"
+          filter="invited"
+          label-key="spacesList.label.invitationsSent"
+          icon="fa-history"
+          badge-color="warning-color-background" />
+        <space-pending-button
+          v-if="$root.pendingCount"
+          :count="$root.pendingCount"
+          filter="pending"
+          label-key="spacesList.label.usersRequests"
+          icon="fa-spinner"
+          icon-class="fa-rotate-270"
+          badge-color="info-color-background" />
+        <div
+          v-if="filterMessage"
+          class="text-subtitle showingSpaceText d-none d-sm-flex ms-3">
+          {{ filterMessage }}
+        </div>
+      </div>
+    </template>
+  </application-toolbar>
+</template>
+<script>
+export default {
+  props: {
+    filter: {
+      type: String,
+      default: null,
+    },
+    filtersCount: {
+      type: Number,
+      default: () => 0,
+    },
+    compactDisplay: {
+      type: Boolean,
+      default: false
+    },
+    filterMessage: {
+      type: String,
+      default: null
+    },
+    canCreateSpace: {
+      type: Boolean,
+      default: false,
+    },
+  },
+  data: () => ({
+    loading: 0,
+  }),
+  created() {
+    this.$root.$on('spaces-list-refresh', this.refresh);
+    this.$root.$on('space-list-pending-updated', this.refresh);
+  },
+  mounted() {
+    this.refresh();
+  },
+  beforeDestroy() {
+    this.$root.$off('spaces-list-refresh', this.refresh);
+    this.$root.$off('space-list-pending-updated', this.refresh);
+  },
+  methods: {
+    refresh() {
+      this.getSpacesInvitation();
+      this.getSpacesPending();
+      this.getSpacesRequest();
+    },
+    getSpacesInvitation() {
+      this.loading++;
+      this.$spaceService.getSpaces(null, null, null, 'invited')
+        .then(data => this.$root.invitationsCount = data && data.size || 0)
+        .finally(() => this.loading--);
+    },
+    getSpacesPending() {
+      this.loading++;
+      this.$spaceService.getSpaces(null, null, null, 'pending')
+        .then(data => this.$root.pendingCount = data?.size || 0)
+        .finally(() => this.loading--);
+    },
+    getSpacesRequest() {
+      this.loading++;
+      this.$spaceService.getSpaces(null, null, null, 'requests')
+        .then(data => this.$root.requestsCount = data?.size || 0)
+        .finally(() => this.loading--);
+    },
+  },
+};
+</script>
diff --git a/webapp/portlet/src/main/webapp/vue-apps/spaces-list/initComponents.js b/webapp/portlet/src/main/webapp/vue-apps/spaces-list/initComponents.js
index 15fbe9780fe..5b345292e5a 100644
--- a/webapp/portlet/src/main/webapp/vue-apps/spaces-list/initComponents.js
+++ b/webapp/portlet/src/main/webapp/vue-apps/spaces-list/initComponents.js
@@ -1,23 +1,53 @@
-import ExoSpacesList from './components/ExoSpacesList.vue';
-import ExoSpacesCardList from './components/ExoSpacesCardList.vue';
-import ExoSpacesToolbar from './components/ExoSpacesToolbar.vue';
-import ExoSpaceCard from './components/ExoSpaceCard.vue';
-import ExoSpaceCardFront from './components/ExoSpaceCardFront.vue';
-import ExoSpaceCardReverse from './components/ExoSpaceCardReverse.vue';
-import ExoSpaceManagersDrawer from './components/ExoSpaceManagersDrawer.vue';
-import ExoSpaceFormDrawer from './components/ExoSpaceFormDrawer.vue';
-import ExoSpaceFavoriteAction from './components/ExoSpaceFavoriteAction.vue';
+/*
+ * This file is part of the Meeds project (https://meeds.io/).
+ * 
+ * Copyright (C) 2020 - 2024 Meeds Association contact@meeds.io
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+import SpacesList from './components/SpacesList.vue';
+import SpacesToolbar from './components/SpacesToolbar.vue';
+import SpacesCardList from './components/SpacesCardList.vue';
+import SpacesListFilterDrawer from './components/SpacesListFilterDrawer.vue';
+import SpaceCard from './components/SpaceCard.vue';
+import SpaceCardButton from './components/SpaceCardButton.vue';
+import SpaceCardMenu from './components/SpaceCardMenu.vue';
+import SpaceCardMenuItem from './components/SpaceCardMenuItem.vue';
+import SpaceCardUnreadBadge from './components/SpaceCardUnreadBadge.vue';
+import SpaceFormDrawer from './components/SpaceFormDrawer.vue';
+import SpaceFavoriteAction from './components/SpaceFavoriteAction.vue';
+import SpacePendingButton from './components/SpacePendingButton.vue';
+import SpacePendingDrawer from './components/SpacePendingDrawer.vue';
+import SpaceRoleListItem from './components/SpaceRoleListItem.vue';
+import SpaceRoleList from './components/SpaceRoleList.vue';
 
 const components = {
-  'exo-spaces-list': ExoSpacesList,
-  'exo-spaces-card-list': ExoSpacesCardList,
-  'exo-spaces-toolbar': ExoSpacesToolbar,
-  'exo-space-card': ExoSpaceCard,
-  'exo-space-card-front': ExoSpaceCardFront,
-  'exo-space-card-reverse': ExoSpaceCardReverse,
-  'exo-space-managers-drawer': ExoSpaceManagersDrawer,
-  'exo-space-form-drawer': ExoSpaceFormDrawer,
-  'exo-space-favorite-action': ExoSpaceFavoriteAction,
+  'spaces-list': SpacesList,
+  'spaces-toolbar': SpacesToolbar,
+  'spaces-card-list': SpacesCardList,
+  'spaces-pending-drawer': SpacePendingDrawer,
+  'spaces-role-list-item': SpaceRoleListItem,
+  'spaces-role-list': SpaceRoleList,
+  'spaces-list-filter-drawer': SpacesListFilterDrawer,
+  'space-card': SpaceCard,
+  'space-card-button': SpaceCardButton,
+  'space-card-menu': SpaceCardMenu,
+  'space-card-menu-item': SpaceCardMenuItem,
+  'space-card-unread-badge': SpaceCardUnreadBadge,
+  'space-form-drawer': SpaceFormDrawer,
+  'space-favorite-action': SpaceFavoriteAction,
+  'space-pending-button': SpacePendingButton,
 };
 
 for (const key in components) {
diff --git a/webapp/portlet/src/main/webapp/vue-apps/spaces-list/main.js b/webapp/portlet/src/main/webapp/vue-apps/spaces-list/main.js
index e1137c0e97b..639c122fc67 100644
--- a/webapp/portlet/src/main/webapp/vue-apps/spaces-list/main.js
+++ b/webapp/portlet/src/main/webapp/vue-apps/spaces-list/main.js
@@ -1,3 +1,21 @@
+/*
+ * This file is part of the Meeds project (https://meeds.io/).
+ * 
+ * Copyright (C) 2020 - 2024 Meeds Association contact@meeds.io
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
 document.dispatchEvent(new CustomEvent('displayTopBarLoading'));
 
 //getting language of user
@@ -12,10 +30,45 @@ export function init(filter, canCreateSpace) {
   exoi18n.loadLanguageAsync(lang, url).then(i18n => {
     // init Vue app when locale ressources are ready
     Vue.createApp({
+      data: {
+        filter: filter || 'all',
+        invitationsCount: 0,
+        pendingCount: 0,
+        requestsCount: 0,
+        unreadPerSpace: null,
+      },
+      computed: {
+        isMobile() {
+          return this.$vuetify.breakpoint.mobile;
+        },
+      },
+      watch: {
+        invitationsCount() {
+          if (!this.invitationsCount) {
+            this.filter = 'all';
+          }
+        },
+        pendingCount() {
+          if (!this.pendingCount) {
+            this.filter = 'all';
+          }
+        },
+      },
+      created() {
+        this.$root.$on('spaces-list-filter-update', this.updateFilter);
+      },
       mounted() {
         document.dispatchEvent(new CustomEvent('hideTopBarLoading'));
       },
-      template: `<exo-spaces-list id="${appId}" filter="${filter || 'all'}" :can-create-space="${canCreateSpace}"></exo-spaces-list>`,
+      beforeDestroy() {
+        this.$root.$off('spaces-list-filter-update', this.updateFilter);
+      },
+      methods: {
+        updateFilter(filter) {
+          this.filter = filter;
+        },
+      },
+      template: `<spaces-list id="${appId}" :filter="filter" :can-create-space="${canCreateSpace}" />`,
       i18n,
       vuetify: Vue.prototype.vuetifyOptions,
     }, `#${appId}`, 'Spaces List');