diff --git a/backend/alembic/versions/0022_collections_.py b/backend/alembic/versions/0022_collections_.py
new file mode 100644
index 000000000..7c11b82af
--- /dev/null
+++ b/backend/alembic/versions/0022_collections_.py
@@ -0,0 +1,125 @@
+"""empty message
+
+Revision ID: 0022_collections
+Revises: 0021_rom_user
+Create Date: 2024-07-01 23:23:39.090219
+
+"""
+
+import json
+import os
+import shutil
+
+import sqlalchemy as sa
+from alembic import op
+from config import RESOURCES_BASE_PATH
+from sqlalchemy.dialects import mysql
+
+# revision identifiers, used by Alembic.
+revision = "0022_collections"
+down_revision = "0021_rom_user"
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.create_table(
+        "collections",
+        sa.Column("id", sa.Integer(), autoincrement=True, nullable=False),
+        sa.Column("name", sa.String(length=400), nullable=False),
+        sa.Column("description", sa.Text(), nullable=True),
+        sa.Column("path_cover_l", sa.String(length=1000), nullable=True),
+        sa.Column("path_cover_s", sa.String(length=1000), nullable=True),
+        sa.Column("url_cover", sa.Text(), nullable=True),
+        sa.Column("roms", sa.JSON(), nullable=False),
+        sa.Column("user_id", sa.Integer(), nullable=False),
+        sa.Column("is_public", sa.Boolean(), nullable=False),
+        sa.Column(
+            "created_at",
+            sa.DateTime(timezone=True),
+            server_default=sa.text("now()"),
+            nullable=False,
+        ),
+        sa.Column(
+            "updated_at",
+            sa.DateTime(timezone=True),
+            server_default=sa.text("now()"),
+            nullable=False,
+        ),
+        sa.ForeignKeyConstraint(["user_id"], ["users.id"], ondelete="CASCADE"),
+        sa.PrimaryKeyConstraint("id"),
+    )
+    with op.batch_alter_table("rom_user", schema=None) as batch_op:
+        batch_op.alter_column(
+            "is_main_sibling",
+            existing_type=mysql.TINYINT(display_width=1),
+            nullable=True,
+        )
+
+    connection = op.get_bind()
+    roms = connection.execute(
+        sa.text(
+            "SELECT id, name, platform_id, path_cover_s, path_cover_l, path_screenshots FROM roms"
+        )
+    ).fetchall()
+
+    # Define the path for the new folder
+    roms_folder_path = os.path.join(RESOURCES_BASE_PATH, "roms")
+
+    # Create the new folder if it doesn't exist
+    os.makedirs(roms_folder_path, exist_ok=True)
+
+    # List all items in the base directory
+    for folder in os.listdir(RESOURCES_BASE_PATH):
+        folder_path = os.path.join(RESOURCES_BASE_PATH, folder)
+
+        # Check if the item is a directory and not the new folder itself
+        if os.path.isdir(folder_path) and folder != "roms":
+            # Move the folder to the new folder
+            shutil.move(folder_path, roms_folder_path)
+
+    # Update paths for each rom
+    for rom in roms:
+        path_cover_s = rom.path_cover_s
+        path_cover_l = rom.path_cover_l
+        path_screenshots = rom.path_screenshots
+
+        # Add "roms/" prefix to path_cover_s and path_cover_l
+        if path_cover_s:
+            path_cover_s = f"roms/{path_cover_s}"
+        if path_cover_l:
+            path_cover_l = f"roms/{path_cover_l}"
+
+        # Add "roms/" prefix to each path in path_screenshots
+        if path_screenshots:
+            path_screenshots_list = json.loads(path_screenshots)
+            path_screenshots_list = [f"roms/{path}" for path in path_screenshots_list]
+            path_screenshots = json.dumps(path_screenshots_list)
+
+        # Update the database with the new paths
+        connection.execute(
+            sa.text(
+                "UPDATE roms SET path_cover_s = :path_cover_s, path_cover_l = :path_cover_l, path_screenshots = :path_screenshots WHERE id = :id"
+            ),
+            {
+                "path_cover_s": path_cover_s,
+                "path_cover_l": path_cover_l,
+                "path_screenshots": path_screenshots,
+                "id": rom.id,
+            },
+        )
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table("rom_user", schema=None) as batch_op:
+        batch_op.alter_column(
+            "is_main_sibling",
+            existing_type=mysql.TINYINT(display_width=1),
+            nullable=False,
+        )
+
+    op.drop_table("collections")
+    # ### end Alembic commands ###
diff --git a/backend/endpoints/collections.py b/backend/endpoints/collections.py
new file mode 100644
index 000000000..de8ca2dd6
--- /dev/null
+++ b/backend/endpoints/collections.py
@@ -0,0 +1,234 @@
+import json
+from shutil import rmtree
+
+from config import RESOURCES_BASE_PATH
+from decorators.auth import protected_route
+from endpoints.responses import MessageResponse
+from endpoints.responses.collection import CollectionSchema
+from exceptions.endpoint_exceptions import (
+    CollectionAlreadyExistsException,
+    CollectionNotFoundInDatabaseException,
+    CollectionPermissionError,
+)
+from fastapi import APIRouter, Request, UploadFile
+from handler.database import db_collection_handler
+from handler.filesystem import fs_resource_handler
+from logger.logger import log
+from models.collection import Collection
+from sqlalchemy.inspection import inspect
+
+router = APIRouter()
+
+
+@protected_route(router.post, "/collections", ["collections.write"])
+async def add_collection(
+    request: Request,
+    artwork: UploadFile | None = None,
+) -> CollectionSchema:
+    """Create collection endpoint
+
+    Args:
+        request (Request): Fastapi Request object
+
+    Returns:
+        CollectionSchema: Just created collection
+    """
+
+    data = await request.form()
+    cleaned_data = {
+        "name": data.get("name", ""),
+        "description": data.get("description", ""),
+        "url_cover": data.get("url_cover", ""),
+        "is_public": data.get("is_public", False),
+        "user_id": request.user.id,
+    }
+    db_collection = db_collection_handler.get_collection_by_name(
+        cleaned_data["name"], request.user.id
+    )
+
+    if db_collection:
+        raise CollectionAlreadyExistsException(cleaned_data["name"])
+
+    _added_collection = db_collection_handler.add_collection(Collection(**cleaned_data))
+
+    if artwork is not None:
+        file_ext = artwork.filename.split(".")[-1]
+        (
+            path_cover_l,
+            path_cover_s,
+            artwork_path,
+        ) = fs_resource_handler.build_artwork_path(_added_collection, file_ext)
+
+        artwork_file = artwork.file.read()
+        file_location_s = f"{artwork_path}/small.{file_ext}"
+        with open(file_location_s, "wb+") as artwork_s:
+            artwork_s.write(artwork_file)
+            fs_resource_handler.resize_cover_to_small(file_location_s)
+
+        file_location_l = f"{artwork_path}/big.{file_ext}"
+        with open(file_location_l, "wb+") as artwork_l:
+            artwork_l.write(artwork_file)
+    else:
+        path_cover_s, path_cover_l = fs_resource_handler.get_cover(
+            overwrite=True,
+            entity=_added_collection,
+            url_cover=_added_collection.url_cover,
+        )
+
+    _added_collection.path_cover_s = path_cover_s
+    _added_collection.path_cover_l = path_cover_l
+    # Update the collection with the cover path and update database
+    return db_collection_handler.update_collection(
+        _added_collection.id,
+        {
+            c: getattr(_added_collection, c)
+            for c in inspect(_added_collection).mapper.column_attrs.keys()
+        },
+    )
+
+
+@protected_route(router.get, "/collections", ["collections.read"])
+def get_collections(request: Request) -> list[CollectionSchema]:
+    """Get collections endpoint
+
+    Args:
+        request (Request): Fastapi Request object
+        id (int, optional): Collection id. Defaults to None.
+
+    Returns:
+        list[CollectionSchema]: List of collections
+    """
+
+    return db_collection_handler.get_collections(user_id=request.user.id)
+
+
+@protected_route(router.get, "/collections/{id}", ["collections.read"])
+def get_collection(request: Request, id: int) -> CollectionSchema:
+    """Get collections endpoint
+
+    Args:
+        request (Request): Fastapi Request object
+        id (int, optional): Collection id. Defaults to None.
+
+    Returns:
+        CollectionSchema: Collection
+    """
+
+    collection = db_collection_handler.get_collection(id)
+
+    if not collection:
+        raise CollectionNotFoundInDatabaseException(id)
+
+    return collection
+
+
+@protected_route(router.put, "/collections/{id}", ["collections.write"])
+async def update_collection(
+    request: Request,
+    id: int,
+    remove_cover: bool = False,
+    artwork: UploadFile | None = None,
+) -> CollectionSchema:
+    """Update collection endpoint
+
+    Args:
+        request (Request): Fastapi Request object
+
+    Returns:
+        MessageResponse: Standard message response
+    """
+
+    data = await request.form()
+    collection = db_collection_handler.get_collection(id)
+
+    if collection.user_id != request.user.id:
+        raise CollectionPermissionError(id)
+
+    if not collection:
+        raise CollectionNotFoundInDatabaseException(id)
+
+    try:
+        roms = json.loads(data["roms"])
+    except json.JSONDecodeError as e:
+        raise ValueError("Invalid list for roms field in update collection") from e
+    except KeyError:
+        roms = collection.roms
+
+    cleaned_data = {
+        "name": data.get("name", collection.name),
+        "description": data.get("description", collection.description),
+        "roms": list(set(roms)),
+        "url_cover": data.get("url_cover", collection.url_cover),
+        "is_public": data.get("is_public", collection.is_public),
+        "user_id": request.user.id,
+    }
+
+    if remove_cover:
+        cleaned_data.update(fs_resource_handler.remove_cover(collection))
+        cleaned_data.update({"url_cover": ""})
+    else:
+        if artwork is not None:
+            file_ext = artwork.filename.split(".")[-1]
+            (
+                path_cover_l,
+                path_cover_s,
+                artwork_path,
+            ) = fs_resource_handler.build_artwork_path(collection, file_ext)
+
+            cleaned_data["path_cover_l"] = path_cover_l
+            cleaned_data["path_cover_s"] = path_cover_s
+
+            artwork_file = artwork.file.read()
+            file_location_s = f"{artwork_path}/small.{file_ext}"
+            with open(file_location_s, "wb+") as artwork_s:
+                artwork_s.write(artwork_file)
+                fs_resource_handler.resize_cover_to_small(file_location_s)
+
+            file_location_l = f"{artwork_path}/big.{file_ext}"
+            with open(file_location_l, "wb+") as artwork_l:
+                artwork_l.write(artwork_file)
+        else:
+            cleaned_data["url_cover"] = data.get("url_cover", collection.url_cover)
+            path_cover_s, path_cover_l = fs_resource_handler.get_cover(
+                overwrite=cleaned_data["url_cover"] != collection.url_cover,
+                entity=collection,
+                url_cover=cleaned_data.get("url_cover", ""),
+            )
+            cleaned_data.update(
+                {"path_cover_s": path_cover_s, "path_cover_l": path_cover_l}
+            )
+
+    return db_collection_handler.update_collection(id, cleaned_data)
+
+
+@protected_route(router.delete, "/collections/{id}", ["collections.write"])
+async def delete_collections(request: Request, id: int) -> MessageResponse:
+    """Delete collections endpoint
+
+    Args:
+        request (Request): Fastapi Request object
+        {
+            "collections": List of rom's ids to delete
+        }
+
+    Raises:
+        HTTPException: Collection not found
+
+    Returns:
+        MessageResponse: Standard message response
+    """
+
+    collection = db_collection_handler.get_collection(id)
+
+    if not collection:
+        raise CollectionNotFoundInDatabaseException(id)
+
+    log.info(f"Deleting {collection.name} from database")
+    db_collection_handler.delete_collection(id)
+
+    try:
+        rmtree(f"{RESOURCES_BASE_PATH}/{collection.fs_resources_path}")
+    except FileNotFoundError:
+        log.error(f"Couldn't find resources to delete for {collection.name}")
+
+    return {"msg": f"{collection.name} deleted successfully!"}
diff --git a/backend/endpoints/platform.py b/backend/endpoints/platform.py
index 85b018451..b701e66b1 100644
--- a/backend/endpoints/platform.py
+++ b/backend/endpoints/platform.py
@@ -34,8 +34,7 @@ async def add_platforms(request: Request) -> PlatformSchema:
     except PlatformAlreadyExistsException:
         log.info(f"Detected platform: {fs_slug}")
     scanned_platform = scan_platform(fs_slug, [fs_slug])
-    platform = db_platform_handler.add_platform(scanned_platform)
-    return platform
+    return db_platform_handler.add_platform(scanned_platform)
 
 
 @protected_route(router.get, "/platforms", ["platforms.read"])
diff --git a/backend/endpoints/responses/collection.py b/backend/endpoints/responses/collection.py
new file mode 100644
index 000000000..a78defb4e
--- /dev/null
+++ b/backend/endpoints/responses/collection.py
@@ -0,0 +1,24 @@
+from datetime import datetime
+
+from pydantic import BaseModel
+
+
+class CollectionSchema(BaseModel):
+    id: int
+    name: str
+    description: str
+    path_cover_l: str | None
+    path_cover_s: str | None
+    has_cover: bool
+    url_cover: str
+    roms: set[int]
+    rom_count: int
+    user_id: int
+    user__username: str
+    is_public: bool
+
+    created_at: datetime
+    updated_at: datetime
+
+    class Config:
+        from_attributes = True
diff --git a/backend/endpoints/responses/rom.py b/backend/endpoints/responses/rom.py
index b0122473a..81a35463b 100644
--- a/backend/endpoints/responses/rom.py
+++ b/backend/endpoints/responses/rom.py
@@ -5,6 +5,7 @@
 from typing import NotRequired, get_type_hints
 
 from endpoints.responses.assets import SaveSchema, ScreenshotSchema, StateSchema
+from endpoints.responses.collection import CollectionSchema
 from fastapi import Request
 from fastapi.responses import StreamingResponse
 from handler.metadata.igdb_handler import IGDBMetadata
@@ -126,12 +127,6 @@ def from_orm_with_request(cls, db_rom: Rom, request: Request) -> RomSchema:
 
         return rom
 
-    @classmethod
-    def from_orm_with_request_list(
-        cls, db_roms: list[Rom], request: Request
-    ) -> list[RomSchema]:
-        return [cls.from_orm_with_request(rom, request) for rom in db_roms]
-
     @computed_field  # type: ignore
     @property
     def sort_comparator(self) -> str:
@@ -153,6 +148,7 @@ class DetailedRomSchema(RomSchema):
     user_states: list[StateSchema] = Field(default_factory=list)
     user_screenshots: list[ScreenshotSchema] = Field(default_factory=list)
     user_notes: list[UserNotesSchema] = Field(default_factory=list)
+    user_collections: list[CollectionSchema] = Field(default_factory=list)
 
     @classmethod
     def from_orm_with_request(cls, db_rom: Rom, request: Request) -> DetailedRomSchema:
@@ -175,6 +171,9 @@ def from_orm_with_request(cls, db_rom: Rom, request: Request) -> DetailedRomSche
             for s in db_rom.screenshots
             if s.user_id == user_id
         ]
+        rom.user_collections = [
+            CollectionSchema.model_validate(c) for c in db_rom.get_collections(user_id)
+        ]
 
         return rom
 
diff --git a/backend/endpoints/rom.py b/backend/endpoints/rom.py
index 907afad42..05ca83f56 100644
--- a/backend/endpoints/rom.py
+++ b/backend/endpoints/rom.py
@@ -94,6 +94,7 @@ def add_roms(
 def get_roms(
     request: Request,
     platform_id: int | None = None,
+    collection_id: int | None = None,
     search_term: str = "",
     limit: int | None = None,
     order_by: str = "name",
@@ -108,15 +109,17 @@ def get_roms(
     Returns:
         list[RomSchema]: List of roms stored in the database
     """
-    db_roms = db_rom_handler.get_roms(
+
+    roms = db_rom_handler.get_roms(
         platform_id=platform_id,
+        collection_id=collection_id,
         search_term=search_term.lower(),
         order_by=order_by.lower(),
         order_dir=order_dir.lower(),
         limit=limit,
     )
 
-    return RomSchema.from_orm_with_request_list(db_roms, request)
+    return [RomSchema.from_orm_with_request(rom, request) for rom in roms]
 
 
 @protected_route(
@@ -292,9 +295,10 @@ async def update_rom(
     if not rom:
         raise RomNotFoundInDatabaseException(id)
 
-    cleaned_data = {}
-    cleaned_data["igdb_id"] = data.get("igdb_id", None)
-    cleaned_data["moby_id"] = data.get("moby_id", None)
+    cleaned_data = {
+        "igdb_id": data.get("igdb_id", None),
+        "moby_id": data.get("moby_id", None),
+    }
 
     if cleaned_data["moby_id"]:
         moby_rom = meta_moby_handler.get_rom_by_id(cleaned_data["moby_id"])
@@ -308,8 +312,12 @@ async def update_rom(
     else:
         cleaned_data.update({"igdb_metadata": {}})
 
-    cleaned_data["name"] = data.get("name", rom.name)
-    cleaned_data["summary"] = data.get("summary", rom.summary)
+    cleaned_data.update(
+        {
+            "name": data.get("name", rom.name),
+            "summary": data.get("summary", rom.summary),
+        }
+    )
 
     fs_safe_file_name = data.get("file_name", rom.file_name).strip().replace("/", "-")
     fs_safe_name = cleaned_data["name"].strip().replace("/", "-")
@@ -327,21 +335,25 @@ async def update_rom(
                 file_path=rom.file_path,
             )
     except RomAlreadyExistsException as exc:
-        log.error(str(exc))
+        log.error(exc)
         raise HTTPException(
-            status_code=status.HTTP_500_INTERNAL_SERVER_ERROR, detail=str(exc)
+            status_code=status.HTTP_500_INTERNAL_SERVER_ERROR, detail=exc
         ) from exc
 
-    cleaned_data["file_name"] = fs_safe_file_name
-    cleaned_data["file_name_no_tags"] = fs_rom_handler.get_file_name_with_no_tags(
-        fs_safe_file_name
-    )
-    cleaned_data["file_name_no_ext"] = fs_rom_handler.get_file_name_with_no_extension(
-        fs_safe_file_name
+    cleaned_data.update(
+        {
+            "file_name": fs_safe_file_name,
+            "file_name_no_tags": fs_rom_handler.get_file_name_with_no_tags(
+                fs_safe_file_name
+            ),
+            "file_name_no_ext": fs_rom_handler.get_file_name_with_no_extension(
+                fs_safe_file_name
+            ),
+        }
     )
 
     if remove_cover:
-        cleaned_data.update(fs_resource_handler.remove_cover(rom=rom))
+        cleaned_data.update(fs_resource_handler.remove_cover(rom))
         cleaned_data.update({"url_cover": ""})
     else:
         if artwork is not None:
@@ -352,8 +364,9 @@ async def update_rom(
                 artwork_path,
             ) = fs_resource_handler.build_artwork_path(rom, file_ext)
 
-            cleaned_data["path_cover_l"] = path_cover_l
-            cleaned_data["path_cover_s"] = path_cover_s
+            cleaned_data.update(
+                {"path_cover_s": path_cover_s, "path_cover_l": path_cover_l}
+            )
 
             artwork_file = artwork.file.read()
             file_location_s = f"{artwork_path}/small.{file_ext}"
@@ -365,10 +378,10 @@ async def update_rom(
             with open(file_location_l, "wb+") as artwork_l:
                 artwork_l.write(artwork_file)
         else:
-            cleaned_data["url_cover"] = data.get("url_cover", rom.url_cover)
-            path_cover_s, path_cover_l = fs_resource_handler.get_rom_cover(
-                overwrite=True,
-                rom=rom,
+            cleaned_data.update({"url_cover": data.get("url_cover", rom.url_cover)})
+            path_cover_s, path_cover_l = fs_resource_handler.get_cover(
+                overwrite=cleaned_data["url_cover"] != rom.url_cover,
+                entity=rom,
                 url_cover=cleaned_data.get("url_cover", ""),
             )
             cleaned_data.update(
@@ -451,15 +464,12 @@ async def update_rom_user(request: Request, id: int) -> RomUserSchema:
         id, request.user.id
     ) or db_rom_handler.add_rom_user(id, request.user.id)
 
-    cleaned_data = {}
-    cleaned_data["note_raw_markdown"] = data.get(
-        "note_raw_markdown", db_rom_user.note_raw_markdown
-    )
-    cleaned_data["note_is_public"] = data.get(
-        "note_is_public", db_rom_user.note_is_public
-    )
-    cleaned_data["is_main_sibling"] = data.get(
-        "is_main_sibling", db_rom_user.is_main_sibling
-    )
+    cleaned_data = {
+        "note_raw_markdown": data.get(
+            "note_raw_markdown", db_rom_user.note_raw_markdown
+        ),
+        "note_is_public": data.get("note_is_public", db_rom_user.note_is_public),
+        "is_main_sibling": data.get("is_main_sibling", db_rom_user.is_main_sibling),
+    }
 
     return db_rom_handler.update_rom_user(db_rom_user.id, cleaned_data)
diff --git a/backend/endpoints/search.py b/backend/endpoints/search.py
index 5cee25c3a..a2c8d624b 100644
--- a/backend/endpoints/search.py
+++ b/backend/endpoints/search.py
@@ -6,6 +6,7 @@
 from handler.metadata import meta_igdb_handler, meta_moby_handler, meta_sgdb_handler
 from handler.metadata.igdb_handler import IGDB_API_ENABLED
 from handler.metadata.moby_handler import MOBY_API_ENABLED
+from handler.metadata.sgdb_handler import STEAMGRIDDB_API_ENABLED
 from handler.scan_handler import _get_main_platform_igdb_id
 from logger.logger import log
 
@@ -115,4 +116,11 @@ async def search_cover(
     search_term: str | None = None,
 ) -> list[SearchCoverSchema]:
 
+    if not STEAMGRIDDB_API_ENABLED:
+        log.error("Search error: No SteamGridDB enabled")
+        raise HTTPException(
+            status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
+            detail="No SteamGridDB enabled",
+        )
+
     return meta_sgdb_handler.get_details(search_term)
diff --git a/backend/endpoints/sockets/scan.py b/backend/endpoints/sockets/scan.py
index b485c63d4..c0eb38a38 100644
--- a/backend/endpoints/sockets/scan.py
+++ b/backend/endpoints/sockets/scan.py
@@ -3,7 +3,6 @@
 import emoji
 import socketio  # type: ignore
 from config import SCAN_TIMEOUT
-from endpoints.responses.firmware import FirmwareSchema
 from endpoints.responses.platform import PlatformSchema
 from endpoints.responses.rom import RomSchema
 from exceptions.fs_exceptions import (
@@ -156,6 +155,7 @@ async def scan_platforms(
                     exclude=EXCLUDED_FROM_DUMP
                 ),
             )
+            await sm.emit("", None)
 
             # Scanning firmware
             try:
@@ -187,17 +187,6 @@ async def scan_platforms(
                 _added_firmware = db_firmware_handler.add_firmware(scanned_firmware)
                 firmware = db_firmware_handler.get_firmware(_added_firmware.id)
 
-                await sm.emit(
-                    "scan:scanning_firmware",
-                    {
-                        "platform_name": platform.name,
-                        "platform_slug": platform.slug,
-                        **FirmwareSchema.model_validate(firmware).model_dump(
-                            exclude=EXCLUDED_FROM_DUMP
-                        ),
-                    },
-                )
-
             # Scanning roms
             try:
                 fs_roms = fs_rom_handler.get_roms(platform)
@@ -236,9 +225,9 @@ async def scan_platforms(
 
                     _added_rom = db_rom_handler.add_rom(scanned_rom)
 
-                    path_cover_s, path_cover_l = fs_resource_handler.get_rom_cover(
+                    path_cover_s, path_cover_l = fs_resource_handler.get_cover(
                         overwrite=True,
-                        rom=_added_rom,
+                        entity=_added_rom,
                         url_cover=_added_rom.url_cover,
                     )
 
@@ -269,6 +258,7 @@ async def scan_platforms(
                             ),
                         },
                     )
+                    await sm.emit("", None)
 
             db_rom_handler.purge_roms(
                 platform.id, [rom["file_name"] for rom in fs_roms]
diff --git a/backend/exceptions/endpoint_exceptions.py b/backend/exceptions/endpoint_exceptions.py
index 0de3d09ba..6e297a8f1 100644
--- a/backend/exceptions/endpoint_exceptions.py
+++ b/backend/exceptions/endpoint_exceptions.py
@@ -22,3 +22,38 @@ def __init__(self, id):
 
     def __repr__(self) -> str:
         return self.message
+
+
+class CollectionNotFoundInDatabaseException(Exception):
+    def __init__(self, id):
+        self.message = f"Collection with id '{id}' not found"
+        super().__init__(self.message)
+        log.critical(self.message)
+        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail=self.message)
+
+    def __repr__(self) -> str:
+        return self.message
+
+
+class CollectionPermissionError(Exception):
+    def __init__(self, id):
+        self.message = f"Permission denied for collection with id '{id}'"
+        super().__init__(self.message)
+        log.critical(self.message)
+        raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail=self.message)
+
+    def __repr__(self) -> str:
+        return self.message
+
+
+class CollectionAlreadyExistsException(Exception):
+    def __init__(self, name):
+        self.message = f"Collection with name '{name}' already exists"
+        super().__init__(self.message)
+        log.critical(self.message)
+        raise HTTPException(
+            status_code=status.HTTP_500_INTERNAL_SERVER_ERROR, detail=self.message
+        )
+
+    def __repr__(self) -> str:
+        return self.message
diff --git a/backend/handler/auth/base_handler.py b/backend/handler/auth/base_handler.py
index 3127d0cf0..c2350aab1 100644
--- a/backend/handler/auth/base_handler.py
+++ b/backend/handler/auth/base_handler.py
@@ -24,6 +24,8 @@
     "firmware.read": "View firmware",
     "roms.user.read": "View user-rom properties",
     "roms.user.write": "Modify user-rom properties",
+    "collections.read": "View collections",
+    "collections.write": "Modify collections",
 }
 
 WRITE_SCOPES_MAP: Final = {
diff --git a/backend/handler/database/__init__.py b/backend/handler/database/__init__.py
index e09b022bc..65816f359 100644
--- a/backend/handler/database/__init__.py
+++ b/backend/handler/database/__init__.py
@@ -1,3 +1,4 @@
+from .collections_handler import DBCollectionsHandler
 from .firmware_handler import DBFirmwareHandler
 from .platforms_handler import DBPlatformsHandler
 from .roms_handler import DBRomsHandler
@@ -15,3 +16,4 @@
 db_state_handler = DBStatesHandler()
 db_stats_handler = DBStatsHandler()
 db_user_handler = DBUsersHandler()
+db_collection_handler = DBCollectionsHandler()
diff --git a/backend/handler/database/collections_handler.py b/backend/handler/database/collections_handler.py
new file mode 100644
index 000000000..2b82a55eb
--- /dev/null
+++ b/backend/handler/database/collections_handler.py
@@ -0,0 +1,62 @@
+from decorators.database import begin_session
+from models.collection import Collection
+from sqlalchemy import Select, delete, select, update
+from sqlalchemy.orm import Session
+
+from .base_handler import DBBaseHandler
+
+
+class DBCollectionsHandler(DBBaseHandler):
+    @begin_session
+    def add_collection(
+        self, collection: Collection, session: Session = None
+    ) -> Collection | None:
+        collection = session.merge(collection)
+        session.flush()
+        return session.scalar(select(Collection).filter_by(id=collection.id).limit(1))
+
+    @begin_session
+    def get_collection(self, id: int, session: Session = None) -> Collection | None:
+        return session.scalar(select(Collection).filter_by(id=id).limit(1))
+
+    @begin_session
+    def get_collection_by_name(
+        self, name: str, user_id: int, session: Session = None
+    ) -> Collection | None:
+        return session.scalar(
+            select(Collection).filter_by(name=name, user_id=user_id).limit(1)
+        )
+
+    @begin_session
+    def get_collections(
+        self, user_id: int, session: Session = None
+    ) -> Select[tuple[Collection]]:
+        return (
+            session.scalars(
+                select(Collection)
+                .filter_by(user_id=user_id)
+                .order_by(Collection.name.asc())
+            )  # type: ignore[attr-defined]
+            .unique()
+            .all()
+        )
+
+    @begin_session
+    def update_collection(
+        self, id: int, data: dict, session: Session = None
+    ) -> Collection:
+        session.execute(
+            update(Collection)
+            .where(Collection.id == id)
+            .values(**data)
+            .execution_options(synchronize_session="evaluate")
+        )
+        return session.query(Collection).filter_by(id=id).one()
+
+    @begin_session
+    def delete_collection(self, id: int, session: Session = None) -> int:
+        return session.execute(
+            delete(Collection)
+            .where(Collection.id == id)
+            .execution_options(synchronize_session="evaluate")
+        )
diff --git a/backend/handler/database/roms_handler.py b/backend/handler/database/roms_handler.py
index 998fa714d..bb69cead2 100644
--- a/backend/handler/database/roms_handler.py
+++ b/backend/handler/database/roms_handler.py
@@ -1,6 +1,7 @@
 import functools
 
 from decorators.database import begin_session
+from models.collection import Collection
 from models.rom import Rom, RomUser
 from sqlalchemy import and_, delete, func, or_, select, update
 from sqlalchemy.orm import Query, Session, selectinload
@@ -44,10 +45,26 @@ def wrapper(*args, **kwargs):
 
 
 class DBRomsHandler(DBBaseHandler):
-    def _filter(self, data, platform_id: int | None, search_term: str):
+    def _filter(
+        self,
+        data,
+        platform_id: int | None,
+        collection_id: int | None,
+        search_term: str,
+        session: Session,
+    ):
         if platform_id:
             data = data.filter(Rom.platform_id == platform_id)
 
+        if collection_id:
+            collection = (
+                session.query(Collection)
+                .filter(Collection.id == collection_id)
+                .one_or_none()
+            )
+            if collection:
+                data = data.filter(Rom.id.in_(collection.roms))
+
         if search_term:
             data = data.filter(
                 or_(
@@ -90,6 +107,7 @@ def get_roms(
         self,
         *,
         platform_id: int | None = None,
+        collection_id: int | None = None,
         search_term: str = "",
         order_by: str = "name",
         order_dir: str = "asc",
@@ -97,17 +115,12 @@ def get_roms(
         query: Query = None,
         session: Session = None,
     ) -> list[Rom]:
-        return (
-            session.scalars(
-                self._order(
-                    self._filter(query, platform_id, search_term),
-                    order_by,
-                    order_dir,
-                ).limit(limit)
-            )
-            .unique()
-            .all()
+        filtered_query = self._filter(
+            query, platform_id, collection_id, search_term, session
         )
+        ordered_query = self._order(filtered_query, order_by, order_dir)
+        limited_query = ordered_query.limit(limit)
+        return session.scalars(limited_query).unique().all()
 
     @begin_session
     @with_details
@@ -166,6 +179,24 @@ def get_sibling_roms(
             )
         ).all()
 
+    @begin_session
+    def get_rom_collections(
+        self, rom: Rom, user_id: int, session: Session = None
+    ) -> list[Collection]:
+
+        return (
+            session.scalars(
+                select(Collection)
+                .filter(
+                    func.json_contains(Collection.roms, f"{rom.id}"),
+                    Collection.user_id == user_id,
+                )
+                .order_by(Collection.name.asc())
+            )
+            .unique()
+            .all()
+        )
+
     @begin_session
     def update_rom(self, id: int, data: dict, session: Session = None) -> Rom:
         return session.execute(
diff --git a/backend/handler/filesystem/resources_handler.py b/backend/handler/filesystem/resources_handler.py
index 4c13d0c54..c96742cc6 100644
--- a/backend/handler/filesystem/resources_handler.py
+++ b/backend/handler/filesystem/resources_handler.py
@@ -6,6 +6,7 @@
 from config import RESOURCES_BASE_PATH
 from fastapi import HTTPException, status
 from logger.logger import log
+from models.collection import Collection
 from models.rom import Rom
 from PIL import Image
 from urllib3.exceptions import ProtocolError
@@ -90,55 +91,57 @@ def _get_cover_path(rom: Rom, size: CoverSize):
         """
         return f"{rom.fs_resources_path}/cover/{size.value}.png"
 
-    def get_rom_cover(
-        self, rom: Rom | None, overwrite: bool, url_cover: str = ""
+    def get_cover(
+        self, entity: Rom | Collection | None, overwrite: bool, url_cover: str = ""
     ) -> tuple[str, str]:
-        if not rom:
+        if not entity:
             return "", ""
 
-        if (overwrite or not self._cover_exists(rom, CoverSize.SMALL)) and url_cover:
-            self._store_cover(rom, url_cover, CoverSize.SMALL)
+        if (overwrite or not self._cover_exists(entity, CoverSize.SMALL)) and url_cover:
+            self._store_cover(entity, url_cover, CoverSize.SMALL)
         path_cover_s = (
-            self._get_cover_path(rom, CoverSize.SMALL)
-            if self._cover_exists(rom, CoverSize.SMALL)
+            self._get_cover_path(entity, CoverSize.SMALL)
+            if self._cover_exists(entity, CoverSize.SMALL)
             else ""
         )
 
-        if (overwrite or not self._cover_exists(rom, CoverSize.BIG)) and url_cover:
-            self._store_cover(rom, url_cover, CoverSize.BIG)
+        if (overwrite or not self._cover_exists(entity, CoverSize.BIG)) and url_cover:
+            self._store_cover(entity, url_cover, CoverSize.BIG)
         path_cover_l = (
-            self._get_cover_path(rom, CoverSize.BIG)
-            if self._cover_exists(rom, CoverSize.BIG)
+            self._get_cover_path(entity, CoverSize.BIG)
+            if self._cover_exists(entity, CoverSize.BIG)
             else ""
         )
 
         return path_cover_s, path_cover_l
 
     @staticmethod
-    def remove_cover(rom: Rom | None):
-        if not rom:
+    def remove_cover(entity: Rom | Collection | None):
+        if not entity:
             return {"path_cover_s": "", "path_cover_l": ""}
 
         try:
-            cover_path = f"{RESOURCES_BASE_PATH}/{rom.fs_resources_path}/cover"
+            cover_path = f"{RESOURCES_BASE_PATH}/{entity.fs_resources_path}/cover"
             shutil.rmtree(cover_path)
         except FileNotFoundError:
             log.warning(
-                f"Couldn't remove rom '{rom.name or rom.id}' cover since '{cover_path}' doesn't exists."
+                f"Couldn't remove cover from '{entity.name or entity.id}' since '{cover_path}' doesn't exists."
             )
 
         return {"path_cover_s": "", "path_cover_l": ""}
 
     @staticmethod
-    def build_artwork_path(rom: Rom | None, file_ext: str):
-        if not rom:
+    def build_artwork_path(entity: Rom | Collection | None, file_ext: str):
+        if not entity:
             return "", "", ""
 
-        path_cover_l = f"{rom.fs_resources_path}/cover/{CoverSize.BIG.value}.{file_ext}"
+        path_cover_l = (
+            f"{entity.fs_resources_path}/cover/{CoverSize.BIG.value}.{file_ext}"
+        )
         path_cover_s = (
-            f"{rom.fs_resources_path}/cover/{CoverSize.SMALL.value}.{file_ext}"
+            f"{entity.fs_resources_path}/cover/{CoverSize.SMALL.value}.{file_ext}"
         )
-        artwork_path = f"{RESOURCES_BASE_PATH}/{rom.fs_resources_path}/cover"
+        artwork_path = f"{RESOURCES_BASE_PATH}/{entity.fs_resources_path}/cover"
         Path(artwork_path).mkdir(parents=True, exist_ok=True)
 
         return path_cover_l, path_cover_s, artwork_path
diff --git a/backend/handler/filesystem/tests/test_fs.py b/backend/handler/filesystem/tests/test_fs.py
index 7f91fbd2d..0291a1b4f 100644
--- a/backend/handler/filesystem/tests/test_fs.py
+++ b/backend/handler/filesystem/tests/test_fs.py
@@ -8,8 +8,8 @@
 
 @pytest.mark.vcr
 def test_get_rom_cover():
-    path_cover_s, path_cover_l = fs_resource_handler.get_rom_cover(
-        overwrite=False, rom=None, url_cover=""
+    path_cover_s, path_cover_l = fs_resource_handler.get_cover(
+        overwrite=False, entity=None, url_cover=""
     )
 
     assert "" in path_cover_s
diff --git a/backend/main.py b/backend/main.py
index 65f89020d..5f006f900 100644
--- a/backend/main.py
+++ b/backend/main.py
@@ -8,6 +8,7 @@
 from config import DEV_HOST, DEV_PORT, DISABLE_CSRF_PROTECTION, ROMM_AUTH_SECRET_KEY
 from endpoints import (
     auth,
+    collections,
     config,
     feeds,
     firmware,
@@ -93,6 +94,7 @@ async def lifespan(app: FastAPI):
 app.include_router(raw.router)
 app.include_router(screenshots.router)
 app.include_router(firmware.router)
+app.include_router(collections.router)
 
 app.mount("/ws", socket_handler.socket_app)
 
diff --git a/backend/models/collection.py b/backend/models/collection.py
new file mode 100644
index 000000000..eee6aec69
--- /dev/null
+++ b/backend/models/collection.py
@@ -0,0 +1,51 @@
+from __future__ import annotations
+
+from functools import cached_property
+
+from models.base import BaseModel
+from models.user import User
+from sqlalchemy import JSON, ForeignKey, String, Text
+from sqlalchemy.orm import Mapped, mapped_column, relationship
+
+
+class Collection(BaseModel):
+    __tablename__ = "collections"
+
+    id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True)
+
+    name: Mapped[str] = mapped_column(String(length=400))
+    description: Mapped[str | None] = mapped_column(Text)
+
+    path_cover_l: Mapped[str | None] = mapped_column(Text, default="")
+    path_cover_s: Mapped[str | None] = mapped_column(Text, default="")
+
+    url_cover: Mapped[str | None] = mapped_column(
+        Text, default="", doc="URL to cover image stored in IGDB"
+    )
+
+    roms: Mapped[set[int]] = mapped_column(
+        JSON, default=[], doc="Rom id's that belong to this collection"
+    )
+
+    user_id: Mapped[int] = mapped_column(ForeignKey("users.id", ondelete="CASCADE"))
+    is_public: Mapped[bool] = mapped_column(default=False)
+    user: Mapped[User] = relationship(lazy="joined", back_populates="collections")
+
+    @property
+    def user__username(self) -> str:
+        return self.user.username
+
+    @property
+    def rom_count(self):
+        return len(self.roms)
+
+    @cached_property
+    def has_cover(self) -> bool:
+        return bool(self.path_cover_s or self.path_cover_l)
+
+    @property
+    def fs_resources_path(self) -> str:
+        return f"collections/{str(self.id)}"
+
+    def __repr__(self) -> str:
+        return self.name
diff --git a/backend/models/rom.py b/backend/models/rom.py
index 5500af70a..cd34df019 100644
--- a/backend/models/rom.py
+++ b/backend/models/rom.py
@@ -11,6 +11,7 @@
 
 if TYPE_CHECKING:
     from models.assets import Save, Screenshot, State
+    from models.collection import Collection
     from models.platform import Platform
     from models.user import User
 
@@ -103,6 +104,11 @@ def get_sibling_roms(self) -> list[Rom]:
 
         return db_rom_handler.get_sibling_roms(self)
 
+    def get_collections(self, user_id) -> list[Collection]:
+        from handler.database import db_rom_handler
+
+        return db_rom_handler.get_rom_collections(self, user_id)
+
     # Metadata fields
     @property
     def alternative_names(self) -> list[str]:
@@ -142,7 +148,7 @@ def game_modes(self) -> list[str]:
 
     @property
     def fs_resources_path(self) -> str:
-        return f"{str(self.platform_id)}/{str(self.id)}"
+        return f"roms/{str(self.platform_id)}/{str(self.id)}"
 
     def __repr__(self) -> str:
         return self.file_name
diff --git a/backend/models/user.py b/backend/models/user.py
index c86c2d80d..c1d80f34f 100644
--- a/backend/models/user.py
+++ b/backend/models/user.py
@@ -11,6 +11,7 @@
 
 if TYPE_CHECKING:
     from models.assets import Save, Screenshot, State
+    from models.collection import Collection
     from models.rom import RomUser
 
 
@@ -40,6 +41,7 @@ class User(BaseModel, SimpleUser):
     states: Mapped[list[State]] = relationship(back_populates="user")
     screenshots: Mapped[list[Screenshot]] = relationship(back_populates="user")
     rom_users: Mapped[list[RomUser]] = relationship(back_populates="user")
+    collections: Mapped[list[Collection]] = relationship(back_populates="user")
 
     @property
     def oauth_scopes(self):
diff --git a/frontend/assets/default/cover/big_dark_collection.png b/frontend/assets/default/cover/big_dark_collection.png
new file mode 100644
index 000000000..869d0e687
Binary files /dev/null and b/frontend/assets/default/cover/big_dark_collection.png differ
diff --git a/frontend/assets/default/cover/big_light_collection.png b/frontend/assets/default/cover/big_light_collection.png
new file mode 100644
index 000000000..9d1570e5e
Binary files /dev/null and b/frontend/assets/default/cover/big_light_collection.png differ
diff --git a/frontend/assets/default/cover/small_dark_collection.png b/frontend/assets/default/cover/small_dark_collection.png
new file mode 100644
index 000000000..996e70385
Binary files /dev/null and b/frontend/assets/default/cover/small_dark_collection.png differ
diff --git a/frontend/assets/default/cover/small_light_collection.png b/frontend/assets/default/cover/small_light_collection.png
new file mode 100644
index 000000000..239a4a10d
Binary files /dev/null and b/frontend/assets/default/cover/small_light_collection.png differ
diff --git a/frontend/src/App.vue b/frontend/src/App.vue
index 750c7935a..3a6030176 100644
--- a/frontend/src/App.vue
+++ b/frontend/src/App.vue
@@ -1,94 +1,18 @@
 <script setup lang="ts">
 import Notification from "@/components/common/Notification.vue";
 import api from "@/services/api/index";
-import socket from "@/services/socket";
 import storeConfig from "@/stores/config";
-import storeGalleryFilter from "@/stores/galleryFilter";
 import storeHeartbeat from "@/stores/heartbeat";
 import storeNotifications from "@/stores/notifications";
-import storeRoms, { type SimpleRom } from "@/stores/roms";
-import storeScanning from "@/stores/scanning";
-import type { Events } from "@/types/emitter";
-import { normalizeString } from "@/utils";
-import type { Emitter } from "mitt";
 import { storeToRefs } from "pinia";
-import { inject, onBeforeUnmount, onMounted } from "vue";
+import { onMounted } from "vue";
 
 // Props
-const scanningStore = storeScanning();
 const notificationStore = storeNotifications();
 const { notifications } = storeToRefs(notificationStore);
-const { scanningPlatforms } = storeToRefs(scanningStore);
-const romsStore = storeRoms();
-const galleryFilter = storeGalleryFilter();
-const isFiltered = normalizeString(galleryFilter.filterSearch).trim() != "";
-const emitter = inject<Emitter<Events>>("emitter");
 const heartbeat = storeHeartbeat();
 const configStore = storeConfig();
 
-socket.on(
-  "scan:scanning_platform",
-  ({ name, slug, id }: { name: string; slug: string; id: number }) => {
-    scanningStore.set(true);
-    scanningPlatforms.value = scanningPlatforms.value.filter(
-      (platform) => platform.name !== name
-    );
-    scanningPlatforms.value.push({ name, slug, id, roms: [] });
-  }
-);
-
-socket.on("scan:scanning_rom", (rom: SimpleRom) => {
-  scanningStore.set(true);
-  if (romsStore.currentPlatform?.id === rom.platform_id) {
-    romsStore.add([rom]);
-    romsStore.setFiltered(
-      isFiltered ? romsStore.filteredRoms : romsStore.allRoms,
-      galleryFilter
-    );
-  }
-
-  let scannedPlatform = scanningPlatforms.value.find(
-    (p) => p.slug === rom.platform_slug
-  );
-
-  // Add the platform if the socket dropped and it's missing
-  if (!scannedPlatform) {
-    scanningPlatforms.value.push({
-      name: rom.platform_name,
-      slug: rom.platform_slug,
-      id: rom.platform_id,
-      roms: [],
-    });
-    scannedPlatform = scanningPlatforms.value[0];
-  }
-
-  scannedPlatform?.roms.push(rom);
-});
-
-socket.on("scan:done", () => {
-  scanningStore.set(false);
-  socket.disconnect();
-
-  emitter?.emit("refreshDrawer", null);
-  emitter?.emit("snackbarShow", {
-    msg: "Scan completed successfully!",
-    icon: "mdi-check-bold",
-    color: "green",
-    timeout: 4000,
-  });
-});
-
-socket.on("scan:done_ko", (msg) => {
-  scanningStore.set(false);
-
-  emitter?.emit("snackbarShow", {
-    msg: `Scan failed: ${msg}`,
-    icon: "mdi-close-circle",
-    color: "red",
-  });
-  socket.disconnect();
-});
-
 onMounted(async () => {
   await api.get("/heartbeat").then(({ data: data }) => {
     heartbeat.set(data);
@@ -98,13 +22,6 @@ onMounted(async () => {
     configStore.set(data);
   });
 });
-
-onBeforeUnmount(() => {
-  socket.off("scan:scanning_platform");
-  socket.off("scan:scanning_rom");
-  socket.off("scan:done");
-  socket.off("scan:done_ko");
-});
 </script>
 
 <template>
diff --git a/frontend/src/__generated__/index.ts b/frontend/src/__generated__/index.ts
index 37f066c7f..66aefac00 100644
--- a/frontend/src/__generated__/index.ts
+++ b/frontend/src/__generated__/index.ts
@@ -5,14 +5,17 @@
 
 export type { AddFirmwareResponse } from "./models/AddFirmwareResponse";
 export type { AddRomsResponse } from "./models/AddRomsResponse";
+export type { Body_add_collection_collections_post } from "./models/Body_add_collection_collections_post";
 export type { Body_add_firmware_firmware_post } from "./models/Body_add_firmware_firmware_post";
 export type { Body_add_roms_roms_post } from "./models/Body_add_roms_roms_post";
 export type { Body_add_saves_saves_post } from "./models/Body_add_saves_saves_post";
 export type { Body_add_screenshots_screenshots_post } from "./models/Body_add_screenshots_screenshots_post";
 export type { Body_add_states_states_post } from "./models/Body_add_states_states_post";
 export type { Body_token_token_post } from "./models/Body_token_token_post";
+export type { Body_update_collection_collections__id__put } from "./models/Body_update_collection_collections__id__put";
 export type { Body_update_rom_roms__id__put } from "./models/Body_update_rom_roms__id__put";
 export type { Body_update_user_users__id__put } from "./models/Body_update_user_users__id__put";
+export type { CollectionSchema } from "./models/CollectionSchema";
 export type { ConfigResponse } from "./models/ConfigResponse";
 export type { DetailedRomSchema } from "./models/DetailedRomSchema";
 export type { FirmwareSchema } from "./models/FirmwareSchema";
diff --git a/frontend/src/__generated__/models/Body_add_collection_collections_post.ts b/frontend/src/__generated__/models/Body_add_collection_collections_post.ts
new file mode 100644
index 000000000..decb18554
--- /dev/null
+++ b/frontend/src/__generated__/models/Body_add_collection_collections_post.ts
@@ -0,0 +1,8 @@
+/* generated using openapi-typescript-codegen -- do no edit */
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+export type Body_add_collection_collections_post = {
+  artwork?: Blob | null;
+};
diff --git a/frontend/src/__generated__/models/Body_update_collection_collections__id__put.ts b/frontend/src/__generated__/models/Body_update_collection_collections__id__put.ts
new file mode 100644
index 000000000..f04969c88
--- /dev/null
+++ b/frontend/src/__generated__/models/Body_update_collection_collections__id__put.ts
@@ -0,0 +1,8 @@
+/* generated using openapi-typescript-codegen -- do no edit */
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+export type Body_update_collection_collections__id__put = {
+  artwork?: Blob | null;
+};
diff --git a/frontend/src/__generated__/models/CollectionSchema.ts b/frontend/src/__generated__/models/CollectionSchema.ts
new file mode 100644
index 000000000..762969e9b
--- /dev/null
+++ b/frontend/src/__generated__/models/CollectionSchema.ts
@@ -0,0 +1,21 @@
+/* generated using openapi-typescript-codegen -- do no edit */
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+export type CollectionSchema = {
+  id: number;
+  name: string;
+  description: string;
+  path_cover_l: string | null;
+  path_cover_s: string | null;
+  has_cover: boolean;
+  url_cover: string;
+  roms: Array<number>;
+  rom_count: number;
+  user_id: number;
+  user__username: string;
+  is_public: boolean;
+  created_at: string;
+  updated_at: string;
+};
diff --git a/frontend/src/__generated__/models/DetailedRomSchema.ts b/frontend/src/__generated__/models/DetailedRomSchema.ts
index 4df6c7079..9dad0491a 100644
--- a/frontend/src/__generated__/models/DetailedRomSchema.ts
+++ b/frontend/src/__generated__/models/DetailedRomSchema.ts
@@ -3,6 +3,7 @@
 /* tslint:disable */
 /* eslint-disable */
 
+import type { CollectionSchema } from "./CollectionSchema";
 import type { RomIGDBMetadata } from "./RomIGDBMetadata";
 import type { RomMobyMetadata } from "./RomMobyMetadata";
 import type { RomSchema } from "./RomSchema";
@@ -58,5 +59,6 @@ export type DetailedRomSchema = {
   user_states?: Array<StateSchema>;
   user_screenshots?: Array<ScreenshotSchema>;
   user_notes?: Array<UserNotesSchema>;
+  user_collections?: Array<CollectionSchema>;
   readonly sort_comparator: string;
 };
diff --git a/frontend/src/components/Administration/Users/Dialog/CreateUser.vue b/frontend/src/components/Administration/Users/Dialog/CreateUser.vue
index 885a747b1..3379e6d08 100644
--- a/frontend/src/components/Administration/Users/Dialog/CreateUser.vue
+++ b/frontend/src/components/Administration/Users/Dialog/CreateUser.vue
@@ -1,11 +1,11 @@
 <script setup lang="ts">
+import RDialog from "@/components/common/RDialog.vue";
 import userApi from "@/services/api/user";
 import storeUsers from "@/stores/users";
 import type { Events } from "@/types/emitter";
 import type { Emitter } from "mitt";
 import { inject, ref } from "vue";
 import { useDisplay } from "vuetify";
-import RDialog from "@/components/common/RDialog.vue";
 
 // Props
 const user = ref({
diff --git a/frontend/src/components/Administration/Users/Dialog/EditUser.vue b/frontend/src/components/Administration/Users/Dialog/EditUser.vue
index f9868a59f..a61ee6b59 100644
--- a/frontend/src/components/Administration/Users/Dialog/EditUser.vue
+++ b/frontend/src/components/Administration/Users/Dialog/EditUser.vue
@@ -1,6 +1,7 @@
 <script setup lang="ts">
 import RDialog from "@/components/common/RDialog.vue";
 import userApi from "@/services/api/user";
+import storeAuth from "@/stores/auth";
 import storeUsers from "@/stores/users";
 import type { Events, UserItem } from "@/types/emitter";
 import { defaultAvatarPath } from "@/utils";
@@ -12,6 +13,7 @@ import { useDisplay } from "vuetify";
 const user = ref<UserItem | null>(null);
 const { lgAndUp } = useDisplay();
 const show = ref(false);
+const auth = storeAuth();
 const usersStore = storeUsers();
 const imagePreviewUrl = ref<string | undefined>("");
 const emitter = inject<Emitter<Events>>("emitter");
@@ -52,6 +54,9 @@ function editUser() {
         timeout: 5000,
       });
       usersStore.update(data);
+      if (data.id == auth.user?.id) {
+        auth.setUser(data);
+      }
     })
     .catch(({ response, message }) => {
       emitter?.emit("snackbarShow", {
diff --git a/frontend/src/components/Administration/Users/Table.vue b/frontend/src/components/Administration/Users/Table.vue
index 9b9ea1bfd..6318c420a 100644
--- a/frontend/src/components/Administration/Users/Table.vue
+++ b/frontend/src/components/Administration/Users/Table.vue
@@ -6,6 +6,7 @@ import storeUsers, { type User } from "@/stores/users";
 import type { Events } from "@/types/emitter";
 import { defaultAvatarPath, formatTimestamp } from "@/utils";
 import type { Emitter } from "mitt";
+import { storeToRefs } from "pinia";
 import { inject, onMounted, ref } from "vue";
 import { useDisplay } from "vuetify";
 
@@ -14,6 +15,7 @@ const userSearch = ref("");
 const { xs } = useDisplay();
 const emitter = inject<Emitter<Events>>("emitter");
 const usersStore = storeUsers();
+const { allUsers } = storeToRefs(usersStore);
 const auth = storeAuth();
 const HEADERS = [
   {
@@ -58,7 +60,7 @@ emitter?.on("updateDataTablePages", updateDataTablePages);
 
 // Functions
 function updateDataTablePages() {
-  pageCount.value = Math.ceil(usersStore.all.length / usersPerPage.value);
+  pageCount.value = Math.ceil(usersStore.allUsers.length / usersPerPage.value);
 }
 
 function disableUser(user: User) {
@@ -106,7 +108,7 @@ onMounted(() => {
         :items-per-page-options="PER_PAGE_OPTIONS"
         :search="userSearch"
         :headers="HEADERS"
-        :items="usersStore.all"
+        :items="allUsers"
         :sort-by="[{ key: 'username', order: 'asc' }]"
         fixed-header
         fixed-footer
diff --git a/frontend/src/components/Details/ActionBar.vue b/frontend/src/components/Details/ActionBar.vue
index f210dcf08..5c9140919 100644
--- a/frontend/src/components/Details/ActionBar.vue
+++ b/frontend/src/components/Details/ActionBar.vue
@@ -1,7 +1,6 @@
 <script setup lang="ts">
 import AdminMenu from "@/components/common/Game/AdminMenu.vue";
 import romApi from "@/services/api/rom";
-import storeAuth from "@/stores/auth";
 import storeDownload from "@/stores/download";
 import type { DetailedRom } from "@/stores/roms";
 import type { Events } from "@/types/emitter";
@@ -13,7 +12,6 @@ import { inject, ref } from "vue";
 const props = defineProps<{ rom: DetailedRom }>();
 const downloadStore = storeDownload();
 const emitter = inject<Emitter<Events>>("emitter");
-const auth = storeAuth();
 const playInfoIcon = ref("mdi-play");
 const emulationSupported = isEmulationSupported(props.rom.platform_slug);
 
@@ -88,11 +86,7 @@ async function copyDownloadLink(rom: DetailedRom) {
     </v-btn>
     <v-menu location="bottom">
       <template #activator="{ props: menuProps }">
-        <v-btn
-          v-if="auth.scopes.includes('roms.write')"
-          class="flex-grow-1"
-          v-bind="menuProps"
-        >
+        <v-btn class="flex-grow-1" v-bind="menuProps">
           <v-icon icon="mdi-dots-vertical" size="large" />
         </v-btn>
       </template>
diff --git a/frontend/src/components/Details/BackgroundHeader.vue b/frontend/src/components/Details/BackgroundHeader.vue
index 53a289c9c..e46c21bb5 100644
--- a/frontend/src/components/Details/BackgroundHeader.vue
+++ b/frontend/src/components/Details/BackgroundHeader.vue
@@ -1,19 +1,22 @@
 <script setup lang="ts">
-import type { DetailedRom } from "@/stores/roms";
+import storeRoms from "@/stores/roms";
+import { storeToRefs } from "pinia";
 import { useTheme } from "vuetify";
 
-defineProps<{ rom: DetailedRom }>();
+// Props
 const theme = useTheme();
+const romsStore = storeRoms();
+const { currentRom } = storeToRefs(romsStore);
 </script>
 
 <template>
-  <v-card rounded="0">
+  <v-card :key="currentRom.updated_at" v-if="currentRom" rounded="0">
     <v-img
       id="background-header"
       :src="
-        !rom.igdb_id && !rom.moby_id && !rom.has_cover
+        !currentRom.igdb_id && !currentRom.moby_id && !currentRom.has_cover
           ? `/assets/default/cover/big_${theme.global.name.value}_unmatched.png`
-          : `/assets/romm/resources/${rom.path_cover_l}`
+          : `/assets/romm/resources/${currentRom.path_cover_l}?ts=${currentRom.updated_at}`
       "
       lazy
       cover
diff --git a/frontend/src/components/Details/Info/FileInfo.vue b/frontend/src/components/Details/Info/FileInfo.vue
index ac34f3c49..7ed3bb50c 100644
--- a/frontend/src/components/Details/Info/FileInfo.vue
+++ b/frontend/src/components/Details/Info/FileInfo.vue
@@ -1,5 +1,6 @@
 <script setup lang="ts">
 import VersionSwitcher from "@/components/Details/VersionSwitcher.vue";
+import RAvatar from "@/components/common/Collection/RAvatar.vue";
 import romApi from "@/services/api/rom";
 import storeAuth from "@/stores/auth";
 import storeDownload from "@/stores/download";
@@ -26,19 +27,19 @@ const romUser = ref(
 
 // Functions
 async function toggleMainSibling() {
-  ownProps.value.is_main_sibling = !ownProps.value.is_main_sibling;
+  romUser.value.is_main_sibling = !romUser.value.is_main_sibling;
   romApi.updateUserRomProps({
     romId: props.rom.id,
-    noteRawMarkdown: ownProps.value.note_raw_markdown,
-    noteIsPublic: ownProps.value.note_is_public,
-    isMainSibling: ownProps.value.is_main_sibling,
+    noteRawMarkdown: romUser.value.note_raw_markdown,
+    noteIsPublic: romUser.value.note_is_public,
+    isMainSibling: romUser.value.is_main_sibling,
   });
 }
 
 watch(
   () => props.rom,
   async () => {
-    ownProps.value = props.rom.rom_user ?? {
+    romUser.value = props.rom.rom_user ?? {
       id: null,
       user_id: auth.user?.id,
       rom_id: props.rom.id,
@@ -79,14 +80,14 @@ watch(
                   size="small"
                   @click="toggleMainSibling"
                   ><v-icon
-                    :class="ownProps.is_main_sibling ? '' : 'mr-1'"
-                    :color="ownProps.is_main_sibling ? 'romm-accent-1' : ''"
+                    :class="romUser.is_main_sibling ? '' : 'mr-1'"
+                    :color="romUser.is_main_sibling ? 'romm-accent-1' : ''"
                     >{{
-                      ownProps.is_main_sibling
+                      romUser.is_main_sibling
                         ? "mdi-checkbox-outline"
                         : "mdi-checkbox-blank-outline"
                     }}</v-icon
-                  >{{ ownProps.is_main_sibling ? "" : "Default" }}</v-btn
+                  >{{ romUser.is_main_sibling ? "" : "Default" }}</v-btn
                 >
               </template></v-tooltip
             >
@@ -150,6 +151,29 @@ watch(
           </v-chip>
         </v-col>
       </v-row>
+      <v-row
+        v-if="rom.user_collections && rom.user_collections?.length > 0"
+        no-gutters
+        class="align-center my-3"
+      >
+        <v-col cols="3" xl="2">
+          <span>Collections</span>
+        </v-col>
+        <v-col>
+          <v-chip
+            v-for="collection in rom.user_collections"
+            :to="{ name: 'collection', params: { collection: collection.id } }"
+            size="large"
+            class="mr-1 mt-1"
+            label
+          >
+            <template #prepend>
+              <r-avatar :size="25" :collection="collection" />
+            </template>
+            <span class="ml-2">{{ collection.name }}</span>
+          </v-chip>
+        </v-col>
+      </v-row>
     </v-col>
   </v-row>
 </template>
diff --git a/frontend/src/components/Details/Info/GameInfo.vue b/frontend/src/components/Details/Info/GameInfo.vue
index de5bc6029..7d5cd613f 100644
--- a/frontend/src/components/Details/Info/GameInfo.vue
+++ b/frontend/src/components/Details/Info/GameInfo.vue
@@ -40,7 +40,7 @@ const show = ref(false);
         <v-divider class="mx-2 my-4" />
         <v-row no-gutters>
           <v-col class="text-caption">
-            <p v-text="rom.summary" />
+            <span>{{ rom.summary }}</span>
           </v-col>
         </v-row>
       </template>
diff --git a/frontend/src/components/Gallery/AppBar/AdminMenu.vue b/frontend/src/components/Gallery/AppBar/AdminMenu.vue
deleted file mode 100644
index fb3b275f7..000000000
--- a/frontend/src/components/Gallery/AppBar/AdminMenu.vue
+++ /dev/null
@@ -1,14 +0,0 @@
-<script setup lang="ts">
-import ScanBtn from "@/components/Gallery/AppBar/ScanBtn.vue";
-import UploadRomBtn from "@/components/Gallery/AppBar/UploadRomBtn.vue";
-import DeleteBtn from "@/components/Gallery/AppBar/DeleteBtn.vue";
-</script>
-
-<template>
-  <v-list rounded="0" class="pa-0">
-    <upload-rom-btn />
-    <scan-btn />
-    <v-divider />
-    <delete-btn />
-  </v-list>
-</template>
diff --git a/frontend/src/components/Gallery/AppBar/Collection/AdminMenu.vue b/frontend/src/components/Gallery/AppBar/Collection/AdminMenu.vue
new file mode 100644
index 000000000..fe0dbc675
--- /dev/null
+++ b/frontend/src/components/Gallery/AppBar/Collection/AdminMenu.vue
@@ -0,0 +1,12 @@
+<script setup lang="ts">
+import DeleteBtn from "@/components/Gallery/AppBar/Collection/DeleteBtn.vue";
+import EditBtn from "@/components/Gallery/AppBar/Collection/EditBtn.vue";
+</script>
+
+<template>
+  <v-list rounded="0" class="pa-0">
+    <edit-btn />
+    <v-divider />
+    <delete-btn />
+  </v-list>
+</template>
diff --git a/frontend/src/components/Gallery/AppBar/Collection/Base.vue b/frontend/src/components/Gallery/AppBar/Collection/Base.vue
new file mode 100644
index 000000000..584696d13
--- /dev/null
+++ b/frontend/src/components/Gallery/AppBar/Collection/Base.vue
@@ -0,0 +1,45 @@
+<script setup lang="ts">
+import AdminMenu from "@/components/Gallery/AppBar/Collection/AdminMenu.vue";
+import FilterBtn from "@/components/Gallery/AppBar/common/FilterBtn.vue";
+import FilterTextField from "@/components/Gallery/AppBar/common/FilterTextField.vue";
+import GalleryViewBtn from "@/components/Gallery/AppBar/common/GalleryViewBtn.vue";
+import SelectingBtn from "@/components/Gallery/AppBar/common/SelectingBtn.vue";
+import FilterDrawer from "@/components/Gallery/AppBar/common/FilterDrawer/Base.vue";
+import FirmwareDrawer from "@/components/Gallery/AppBar/Platform/FirmwareDrawer.vue";
+import storeAuth from "@/stores/auth";
+
+// Props
+const auth = storeAuth();
+</script>
+
+<template>
+  <v-app-bar id="gallery-app-bar" elevation="0" density="compact">
+    <filter-btn />
+    <filter-text-field />
+    <selecting-btn />
+    <gallery-view-btn />
+    <v-menu location="bottom">
+      <template #activator="{ props }">
+        <v-btn
+          v-if="auth.scopes.includes('collections.write')"
+          v-bind="props"
+          rounded="0"
+          variant="text"
+          class="mr-0"
+          icon="mdi-dots-vertical"
+          @click.stop
+        />
+      </template>
+      <admin-menu />
+    </v-menu>
+  </v-app-bar>
+
+  <filter-drawer />
+  <firmware-drawer />
+</template>
+
+<style scoped>
+#gallery-app-bar {
+  z-index: 999 !important;
+}
+</style>
diff --git a/frontend/src/components/Gallery/AppBar/Collection/DeleteBtn.vue b/frontend/src/components/Gallery/AppBar/Collection/DeleteBtn.vue
new file mode 100644
index 000000000..c91e490cc
--- /dev/null
+++ b/frontend/src/components/Gallery/AppBar/Collection/DeleteBtn.vue
@@ -0,0 +1,31 @@
+<script setup lang="ts">
+import { type Collection } from "@/stores/collections";
+import storeRoms from "@/stores/roms";
+import type { Events } from "@/types/emitter";
+import type { Emitter } from "mitt";
+import { inject } from "vue";
+import { useRoute } from "vue-router";
+
+// Props
+const emitter = inject<Emitter<Events>>("emitter");
+const route = useRoute();
+const roms = storeRoms();
+</script>
+
+<template>
+  <v-list-item
+    v-if="route.params.collection"
+    class="py-4 pr-5 text-romm-red"
+    @click="
+      emitter?.emit(
+        'showDeleteCollectionDialog',
+        roms.currentCollection as Collection
+      )
+    "
+  >
+    <v-list-item-title class="d-flex">
+      <v-icon icon="mdi-delete" color="red" class="mr-2" />
+      Delete collection
+    </v-list-item-title>
+  </v-list-item>
+</template>
diff --git a/frontend/src/components/Gallery/AppBar/Collection/EditBtn.vue b/frontend/src/components/Gallery/AppBar/Collection/EditBtn.vue
new file mode 100644
index 000000000..3081b5fe5
--- /dev/null
+++ b/frontend/src/components/Gallery/AppBar/Collection/EditBtn.vue
@@ -0,0 +1,31 @@
+<script setup lang="ts">
+import storeRoms from "@/stores/roms";
+import type { Collection } from "@/stores/collections";
+import type { Events } from "@/types/emitter";
+import type { Emitter } from "mitt";
+import { inject } from "vue";
+import { useRoute } from "vue-router";
+
+// Props
+const emitter = inject<Emitter<Events>>("emitter");
+const route = useRoute();
+const roms = storeRoms();
+</script>
+
+<template>
+  <v-list-item
+    v-if="route.params.collection"
+    class="py-4 pr-5"
+    @click="
+      emitter?.emit(
+        'showEditCollectionDialog',
+        roms.currentCollection as Collection
+      )
+    "
+  >
+    <v-list-item-title class="d-flex">
+      <v-icon icon="mdi-pencil-box" class="mr-2" />
+      Edit collection
+    </v-list-item-title>
+  </v-list-item>
+</template>
diff --git a/frontend/src/components/Gallery/AppBar/Platform/AdminMenu.vue b/frontend/src/components/Gallery/AppBar/Platform/AdminMenu.vue
new file mode 100644
index 000000000..d159b0db1
--- /dev/null
+++ b/frontend/src/components/Gallery/AppBar/Platform/AdminMenu.vue
@@ -0,0 +1,14 @@
+<script setup lang="ts">
+import ScanBtn from "@/components/Gallery/AppBar/Platform/ScanBtn.vue";
+import UploadRomBtn from "@/components/Gallery/AppBar/Platform/UploadRomBtn.vue";
+import DeleteBtn from "@/components/Gallery/AppBar/Platform/DeleteBtn.vue";
+</script>
+
+<template>
+  <v-list rounded="0" class="pa-0">
+    <upload-rom-btn />
+    <scan-btn />
+    <v-divider />
+    <delete-btn />
+  </v-list>
+</template>
diff --git a/frontend/src/components/Gallery/AppBar/Base.vue b/frontend/src/components/Gallery/AppBar/Platform/Base.vue
similarity index 55%
rename from frontend/src/components/Gallery/AppBar/Base.vue
rename to frontend/src/components/Gallery/AppBar/Platform/Base.vue
index c5fed7b4c..abb62d621 100644
--- a/frontend/src/components/Gallery/AppBar/Base.vue
+++ b/frontend/src/components/Gallery/AppBar/Platform/Base.vue
@@ -1,12 +1,12 @@
 <script setup lang="ts">
-import AdminMenu from "@/components/Gallery/AppBar/AdminMenu.vue";
-import FilterBtn from "@/components/Gallery/AppBar/FilterBtn.vue";
-import FilterTextField from "@/components/Gallery/AppBar/FilterTextField.vue";
-import FirmwareBtn from "@/components/Gallery/AppBar/FirmwareBtn.vue";
-import GalleryViewBtn from "@/components/Gallery/AppBar/GalleryViewBtn.vue";
-import SelectingBtn from "@/components/Gallery/AppBar/SelectingBtn.vue";
-import FilterDrawer from "@/components/Gallery/FilterDrawer/Base.vue";
-import FirmwareDrawer from "@/components/Gallery/FirmwareDrawer.vue";
+import AdminMenu from "@/components/Gallery/AppBar/Platform/AdminMenu.vue";
+import FilterBtn from "@/components/Gallery/AppBar/common/FilterBtn.vue";
+import FilterTextField from "@/components/Gallery/AppBar/common/FilterTextField.vue";
+import FirmwareBtn from "@/components/Gallery/AppBar/Platform/FirmwareBtn.vue";
+import GalleryViewBtn from "@/components/Gallery/AppBar/common/GalleryViewBtn.vue";
+import SelectingBtn from "@/components/Gallery/AppBar/common/SelectingBtn.vue";
+import FilterDrawer from "@/components/Gallery/AppBar/common/FilterDrawer/Base.vue";
+import FirmwareDrawer from "@/components/Gallery/AppBar/Platform/FirmwareDrawer.vue";
 import storeAuth from "@/stores/auth";
 
 // Props
diff --git a/frontend/src/components/Gallery/AppBar/DeleteBtn.vue b/frontend/src/components/Gallery/AppBar/Platform/DeleteBtn.vue
similarity index 68%
rename from frontend/src/components/Gallery/AppBar/DeleteBtn.vue
rename to frontend/src/components/Gallery/AppBar/Platform/DeleteBtn.vue
index 6252244d4..6afe35aa8 100644
--- a/frontend/src/components/Gallery/AppBar/DeleteBtn.vue
+++ b/frontend/src/components/Gallery/AppBar/Platform/DeleteBtn.vue
@@ -1,13 +1,14 @@
 <script setup lang="ts">
+import { type Platform } from "@/stores/platforms";
+import storeRoms from "@/stores/roms";
+import type { Events } from "@/types/emitter";
+import type { Emitter } from "mitt";
 import { inject } from "vue";
 import { useRoute } from "vue-router";
-import type { Emitter } from "mitt";
-import type { Events } from "@/types/emitter";
-import storePlatforms, { type Platform } from "@/stores/platforms";
 
 // Props
 const emitter = inject<Emitter<Events>>("emitter");
-const platforms = storePlatforms();
+const roms = storeRoms();
 const route = useRoute();
 </script>
 
@@ -18,16 +19,12 @@ const route = useRoute();
     @click="
       emitter?.emit(
         'showDeletePlatformDialog',
-        platforms.get(Number(route.params.platform)) as Platform
+        roms.currentPlatform as Platform
       )
     "
   >
     <v-list-item-title class="d-flex">
-      <v-icon
-        icon="mdi-delete"
-        color="red"
-        class="mr-2"
-      />
+      <v-icon icon="mdi-delete" color="red" class="mr-2" />
       Delete platform
     </v-list-item-title>
   </v-list-item>
diff --git a/frontend/src/components/Gallery/AppBar/FirmwareBtn.vue b/frontend/src/components/Gallery/AppBar/Platform/FirmwareBtn.vue
similarity index 100%
rename from frontend/src/components/Gallery/AppBar/FirmwareBtn.vue
rename to frontend/src/components/Gallery/AppBar/Platform/FirmwareBtn.vue
diff --git a/frontend/src/components/Gallery/FirmwareDrawer.vue b/frontend/src/components/Gallery/AppBar/Platform/FirmwareDrawer.vue
similarity index 100%
rename from frontend/src/components/Gallery/FirmwareDrawer.vue
rename to frontend/src/components/Gallery/AppBar/Platform/FirmwareDrawer.vue
diff --git a/frontend/src/components/Gallery/AppBar/ScanBtn.vue b/frontend/src/components/Gallery/AppBar/Platform/ScanBtn.vue
similarity index 100%
rename from frontend/src/components/Gallery/AppBar/ScanBtn.vue
rename to frontend/src/components/Gallery/AppBar/Platform/ScanBtn.vue
diff --git a/frontend/src/components/Gallery/AppBar/UploadRomBtn.vue b/frontend/src/components/Gallery/AppBar/Platform/UploadRomBtn.vue
similarity index 100%
rename from frontend/src/components/Gallery/AppBar/UploadRomBtn.vue
rename to frontend/src/components/Gallery/AppBar/Platform/UploadRomBtn.vue
diff --git a/frontend/src/components/Gallery/AppBar/FilterBtn.vue b/frontend/src/components/Gallery/AppBar/common/FilterBtn.vue
similarity index 100%
rename from frontend/src/components/Gallery/AppBar/FilterBtn.vue
rename to frontend/src/components/Gallery/AppBar/common/FilterBtn.vue
diff --git a/frontend/src/components/Gallery/FilterDrawer/Base.vue b/frontend/src/components/Gallery/AppBar/common/FilterDrawer/Base.vue
similarity index 95%
rename from frontend/src/components/Gallery/FilterDrawer/Base.vue
rename to frontend/src/components/Gallery/AppBar/common/FilterDrawer/Base.vue
index b0b7175d7..5ddae329e 100644
--- a/frontend/src/components/Gallery/FilterDrawer/Base.vue
+++ b/frontend/src/components/Gallery/AppBar/common/FilterDrawer/Base.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import FilterUnmatchedBtn from "@/components/Gallery/FilterDrawer/FilterUnmatchedBtn.vue";
+import FilterUnmatchedBtn from "@/components/Gallery/AppBar/common/FilterDrawer/FilterUnmatchedBtn.vue";
 import storeGalleryFilter from "@/stores/galleryFilter";
 import type { Events } from "@/types/emitter";
 import type { Emitter } from "mitt";
diff --git a/frontend/src/components/Gallery/FilterDrawer/FilterUnmatchedBtn.vue b/frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterUnmatchedBtn.vue
similarity index 100%
rename from frontend/src/components/Gallery/FilterDrawer/FilterUnmatchedBtn.vue
rename to frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterUnmatchedBtn.vue
diff --git a/frontend/src/components/Gallery/AppBar/FilterTextField.vue b/frontend/src/components/Gallery/AppBar/common/FilterTextField.vue
similarity index 100%
rename from frontend/src/components/Gallery/AppBar/FilterTextField.vue
rename to frontend/src/components/Gallery/AppBar/common/FilterTextField.vue
diff --git a/frontend/src/components/Gallery/AppBar/GalleryViewBtn.vue b/frontend/src/components/Gallery/AppBar/common/GalleryViewBtn.vue
similarity index 100%
rename from frontend/src/components/Gallery/AppBar/GalleryViewBtn.vue
rename to frontend/src/components/Gallery/AppBar/common/GalleryViewBtn.vue
diff --git a/frontend/src/components/Gallery/AppBar/SelectingBtn.vue b/frontend/src/components/Gallery/AppBar/common/SelectingBtn.vue
similarity index 100%
rename from frontend/src/components/Gallery/AppBar/SelectingBtn.vue
rename to frontend/src/components/Gallery/AppBar/common/SelectingBtn.vue
diff --git a/frontend/src/components/Gallery/AppBar/SortBar.vue b/frontend/src/components/Gallery/AppBar/common/SortBar.vue
similarity index 100%
rename from frontend/src/components/Gallery/AppBar/SortBar.vue
rename to frontend/src/components/Gallery/AppBar/common/SortBar.vue
diff --git a/frontend/src/components/Gallery/AppBar/SortBtn.vue b/frontend/src/components/Gallery/AppBar/common/SortBtn.vue
similarity index 100%
rename from frontend/src/components/Gallery/AppBar/SortBtn.vue
rename to frontend/src/components/Gallery/AppBar/common/SortBtn.vue
diff --git a/frontend/src/components/Gallery/FabOverlay.vue b/frontend/src/components/Gallery/FabOverlay.vue
index cbb90b08e..09576c494 100644
--- a/frontend/src/components/Gallery/FabOverlay.vue
+++ b/frontend/src/components/Gallery/FabOverlay.vue
@@ -118,35 +118,50 @@ function onDownload() {
       </v-btn>
       <v-btn
         key="2"
+        v-if="auth.scopes.includes('roms.write')"
         color="terciary"
         elevation="8"
-        icon
+        icon="mdi-magnify-scan"
         size="default"
-        @click="onDownload"
-      >
-        <v-icon>mdi-download</v-icon>
-      </v-btn>
+        @click="onScan"
+      />
       <v-btn
         key="3"
-        v-if="auth.scopes.includes('roms.write')"
         color="terciary"
         elevation="8"
-        icon
+        icon="mdi-download"
         size="default"
-        @click="onScan"
-      >
-        <v-icon>mdi-magnify-scan</v-icon>
-      </v-btn>
+        @click="onDownload"
+      />
       <v-btn
         key="4"
         color="terciary"
         elevation="8"
+        :icon="
+          $route.name == 'platform'
+            ? 'mdi-bookmark-plus'
+            : 'mdi-bookmark-remove'
+        "
+        size="default"
+        @click="
+          $route.name == 'platform'
+            ? emitter?.emit('showAddToCollectionDialog', romsStore.selectedRoms)
+            : emitter?.emit(
+                'showRemoveFromCollectionDialog',
+                romsStore.selectedRoms
+              )
+        "
+      />
+      <v-btn
+        key="5"
+        color="terciary"
+        elevation="8"
         icon="mdi-select-all"
         size="default"
         @click.stop="selectAllRoms"
       />
       <v-btn
-        key="5"
+        key="6"
         color="terciary"
         elevation="8"
         icon="mdi-select"
diff --git a/frontend/src/components/common/Collection/Card.vue b/frontend/src/components/common/Collection/Card.vue
new file mode 100644
index 000000000..a9165a714
--- /dev/null
+++ b/frontend/src/components/common/Collection/Card.vue
@@ -0,0 +1,105 @@
+<script setup lang="ts">
+import type { Collection } from "@/stores/collections";
+import { useTheme } from "vuetify";
+
+withDefaults(
+  defineProps<{
+    collection: Collection;
+    transformScale?: boolean;
+    showTitle?: boolean;
+    showRomCount?: boolean;
+    withLink?: boolean;
+    src?: string;
+  }>(),
+  {
+    transformScale: false,
+    showTitle: false,
+    showRomCount: false,
+    withLink: true,
+    src: "",
+  }
+);
+const theme = useTheme();
+</script>
+
+<template>
+  <v-hover v-slot="{ isHovering, props: hoverProps }">
+    <v-card
+      v-bind="hoverProps"
+      :class="{
+        'on-hover': isHovering,
+        'transform-scale': transformScale,
+      }"
+      :elevation="isHovering && transformScale ? 20 : 3"
+      :to="
+        withLink && collection
+          ? { name: 'collection', params: { collection: collection.id } }
+          : ''
+      "
+    >
+      <v-row v-if="showTitle" class="pa-1 justify-center bg-primary">
+        <div
+          :title="collection.name?.toString()"
+          class="py-4 px-6 text-truncate text-caption"
+        >
+          <span>{{ collection.name }}</span>
+        </div>
+      </v-row>
+      <v-img
+        cover
+        :src="
+          src
+            ? src
+            : collection.has_cover
+            ? `/assets/romm/resources/${collection.path_cover_l}?ts=${collection.updated_at}`
+            : `/assets/default/cover/big_${theme.global.name.value}_collection.png`
+        "
+        :lazy-src="
+          src
+            ? src
+            : collection.has_cover
+            ? `/assets/romm/resources/${collection.path_cover_s}?ts=${collection.updated_at}`
+            : `/assets/default/cover/small_${theme.global.name.value}_collection.png`
+        "
+        :aspect-ratio="2 / 3"
+      >
+        <div class="position-absolute append-inner">
+          <slot name="append-inner"></slot>
+        </div>
+
+        <template #error>
+          <v-img
+            :src="`/assets/default/cover/big_${theme.global.name.value}_missing_cover.png`"
+            cover
+            :aspect-ratio="2 / 3"
+          ></v-img>
+        </template>
+        <template #placeholder>
+          <div class="d-flex align-center justify-center fill-height">
+            <v-progress-circular
+              :width="2"
+              :size="40"
+              color="romm-accent-1"
+              indeterminate
+            />
+          </div>
+        </template>
+      </v-img>
+      <v-chip
+        v-if="showRomCount"
+        class="bg-chip position-absolute"
+        size="x-small"
+        style="bottom: 0.5rem; right: 0.5rem"
+        label
+      >
+        {{ collection.rom_count }}
+      </v-chip>
+    </v-card>
+  </v-hover>
+</template>
+<style scoped>
+.append-inner {
+  bottom: 0rem;
+  right: 0rem;
+}
+</style>
diff --git a/frontend/src/components/common/Collection/Dialog/AddRoms.vue b/frontend/src/components/common/Collection/Dialog/AddRoms.vue
new file mode 100644
index 000000000..a51857703
--- /dev/null
+++ b/frontend/src/components/common/Collection/Dialog/AddRoms.vue
@@ -0,0 +1,198 @@
+<script setup lang="ts">
+import RAvatarCollection from "@/components/common/Collection/RAvatar.vue";
+import RAvatarRom from "@/components/common/Game/RAvatar.vue";
+import RDialog from "@/components/common/RDialog.vue";
+import type { UpdatedCollection } from "@/services/api/collection";
+import collectionApi from "@/services/api/collection";
+import storeCollections from "@/stores/collections";
+import storeRoms, { type SimpleRom } from "@/stores/roms";
+import type { Events } from "@/types/emitter";
+import type { Emitter } from "mitt";
+import { inject, ref, watch } from "vue";
+import { useDisplay } from "vuetify";
+
+// Props
+const { mdAndUp } = useDisplay();
+const show = ref(false);
+const romsStore = storeRoms();
+const collectionsStore = storeCollections();
+const selectedCollection = ref<UpdatedCollection>();
+const roms = ref<SimpleRom[]>([]);
+const emitter = inject<Emitter<Events>>("emitter");
+emitter?.on("showAddToCollectionDialog", (romsToAdd) => {
+  roms.value = romsToAdd;
+  updateDataTablePages();
+  show.value = true;
+});
+const HEADERS = [
+  {
+    title: "Name",
+    align: "start",
+    sortable: true,
+    key: "name",
+  },
+] as const;
+const page = ref(1);
+const itemsPerPage = ref(10);
+const pageCount = ref(0);
+const PER_PAGE_OPTIONS = [10, 25, 50, 100];
+
+// Functions
+async function addRomsToCollection() {
+  if (!selectedCollection.value) return;
+  selectedCollection.value.roms.push(...roms.value.map((r) => r.id));
+  await collectionApi
+    .updateCollection({ collection: selectedCollection.value })
+    .then(({ data }) => {
+      emitter?.emit("snackbarShow", {
+        msg: `Roms added to ${selectedCollection.value?.name} successfully!`,
+        icon: "mdi-check-bold",
+        color: "green",
+        timeout: 2000,
+      });
+    })
+    .catch((error) => {
+      console.log(error);
+      emitter?.emit("snackbarShow", {
+        msg: error.response.data.detail,
+        icon: "mdi-close-circle",
+        color: "red",
+      });
+      return;
+    })
+    .finally(() => {
+      emitter?.emit("showLoadingDialog", { loading: false, scrim: false });
+      romsStore.resetSelection();
+      closeDialog();
+    });
+}
+
+function updateDataTablePages() {
+  pageCount.value = Math.ceil(roms.value.length / itemsPerPage.value);
+}
+
+watch(itemsPerPage, async () => {
+  updateDataTablePages();
+});
+
+function closeDialog() {
+  roms.value = [];
+  show.value = false;
+  selectedCollection.value = undefined;
+}
+</script>
+
+<template>
+  <r-dialog
+    @close="closeDialog"
+    v-model="show"
+    icon="mdi-bookmark-plus-outline"
+    scroll-content
+    :width="mdAndUp ? '45vw' : '95vw'"
+  >
+    <template #header>
+      <v-row no-gutters class="justify-center">
+        <span>Adding</span>
+        <span class="text-romm-accent-1 mx-1">{{ roms.length }}</span>
+        <span>games to collection</span>
+      </v-row>
+    </template>
+    <template #prepend>
+      <v-autocomplete
+        v-model="selectedCollection"
+        class="pa-3"
+        density="default"
+        label="Collection"
+        item-title="name"
+        :items="collectionsStore.allCollections"
+        variant="outlined"
+        hide-details
+        return-object
+        clearable
+      >
+        <template #item="{ props, item }">
+          <v-list-item
+            class="py-4"
+            v-bind="props"
+            :title="item.raw.name ?? ''"
+            :subtitle="item.raw.description"
+          >
+            <template #prepend>
+              <r-avatar-collection :collection="item.raw" />
+            </template>
+            <template #append>
+              <v-chip class="ml-2" size="x-small" label>
+                {{ item.raw.rom_count }}
+              </v-chip>
+            </template>
+          </v-list-item>
+        </template>
+      </v-autocomplete>
+    </template>
+    <template #content>
+      <v-data-table
+        :item-value="(item) => item.id"
+        :items="roms"
+        :width="mdAndUp ? '60vw' : '95vw'"
+        :items-per-page="itemsPerPage"
+        :items-per-page-options="PER_PAGE_OPTIONS"
+        :headers="HEADERS"
+        v-model:page="page"
+        hide-default-header
+      >
+        <template #item.name="{ item }">
+          <v-list-item class="px-0">
+            <template #prepend>
+              <r-avatar-rom :rom="item" />
+            </template>
+            <v-row no-gutters
+              ><v-col>{{ item.name }}</v-col></v-row
+            >
+          </v-list-item>
+        </template>
+        <template #bottom>
+          <v-divider />
+          <v-row no-gutters class="pt-2 align-center justify-center">
+            <v-col class="px-6">
+              <v-pagination
+                v-model="page"
+                rounded="0"
+                :show-first-last-page="true"
+                active-color="romm-accent-1"
+                :length="pageCount"
+              />
+            </v-col>
+            <v-col cols="5" sm="3">
+              <v-select
+                v-model="itemsPerPage"
+                class="pa-2"
+                label="Roms per page"
+                density="compact"
+                variant="outlined"
+                :items="PER_PAGE_OPTIONS"
+                hide-details
+              />
+            </v-col>
+          </v-row>
+        </template>
+      </v-data-table>
+    </template>
+    <template #append>
+      <v-row class="justify-center my-2">
+        <v-btn-group divided density="compact">
+          <v-btn class="bg-terciary" @click="closeDialog" variant="flat">
+            Cancel
+          </v-btn>
+          <v-btn
+            class="bg-terciary text-romm-green"
+            :disabled="!selectedCollection"
+            :variant="!selectedCollection ? 'plain' : 'flat'"
+            @click="addRomsToCollection"
+          >
+            Confirm
+          </v-btn>
+        </v-btn-group>
+      </v-row>
+    </template>
+  </r-dialog>
+</template>
diff --git a/frontend/src/components/common/Collection/Dialog/CreateCollection.vue b/frontend/src/components/common/Collection/Dialog/CreateCollection.vue
new file mode 100644
index 000000000..0c0f34873
--- /dev/null
+++ b/frontend/src/components/common/Collection/Dialog/CreateCollection.vue
@@ -0,0 +1,214 @@
+<script setup lang="ts">
+import CollectionCard from "@/components/common/Collection/Card.vue";
+import RDialog from "@/components/common/RDialog.vue";
+import collectionApi, {
+  type UpdatedCollection,
+} from "@/services/api/collection";
+import storeCollections from "@/stores/collections";
+import storeHeartbeat from "@/stores/heartbeat";
+import type { Events } from "@/types/emitter";
+import type { Emitter } from "mitt";
+import { inject, ref } from "vue";
+import { useDisplay, useTheme } from "vuetify";
+
+// Props
+const theme = useTheme();
+const { mdAndUp } = useDisplay();
+const show = ref(false);
+const heartbeat = storeHeartbeat();
+const collection = ref<UpdatedCollection>({} as UpdatedCollection);
+const collectionsStore = storeCollections();
+const imagePreviewUrl = ref<string | undefined>("");
+const removeCover = ref(false);
+const emitter = inject<Emitter<Events>>("emitter");
+emitter?.on("showCreateCollectionDialog", () => {
+  show.value = true;
+});
+emitter?.on("updateUrlCover", (url_cover) => {
+  if (!collection.value) return;
+  collection.value.url_cover = url_cover;
+  imagePreviewUrl.value = url_cover;
+});
+
+// Functions
+function triggerFileInput() {
+  const fileInput = document.getElementById("file-input");
+  fileInput?.click();
+}
+
+function previewImage(event: Event) {
+  const input = event.target as HTMLInputElement;
+  if (!input.files) return;
+
+  const reader = new FileReader();
+  reader.onload = () => {
+    imagePreviewUrl.value = reader.result?.toString();
+  };
+  if (input.files[0]) {
+    reader.readAsDataURL(input.files[0]);
+  }
+}
+
+async function removeArtwork() {
+  imagePreviewUrl.value = `/assets/default/cover/big_${theme.global.name.value}_missing_cover.png`;
+  removeCover.value = true;
+}
+
+async function createCollection() {
+  if (!collection.value) return;
+
+  emitter?.emit("showLoadingDialog", { loading: true, scrim: true });
+
+  await collectionApi
+    .createCollection({
+      collection: collection.value,
+    })
+    .then(({ data }) => {
+      collectionsStore.add(data);
+      emitter?.emit("snackbarShow", {
+        msg: `Collection ${data.name} created successfully!`,
+        icon: "mdi-check-bold",
+        color: "green",
+        timeout: 2000,
+      });
+      show.value = false;
+    })
+    .catch((error) => {
+      console.log(error);
+      emitter?.emit("snackbarShow", {
+        msg: error.response.data.detail,
+        icon: "mdi-close-circle",
+        color: "red",
+      });
+    })
+    .finally(() => {
+      emitter?.emit("showLoadingDialog", { loading: false, scrim: false });
+      closeDialog();
+    });
+}
+
+function closeDialog() {
+  show.value = false;
+  collection.value = {} as UpdatedCollection;
+  imagePreviewUrl.value = "";
+}
+</script>
+
+<template>
+  <r-dialog
+    @close="closeDialog"
+    v-model="show"
+    icon="mdi-bookmark-box-multiple"
+    :width="mdAndUp ? '55vw' : '95vw'"
+  >
+    <template #content>
+      <v-row class="align-center pa-2" no-gutters>
+        <v-col cols="12" lg="7" xl="9">
+          <v-row class="pa-2" no-gutters>
+            <v-col>
+              <v-text-field
+                v-model="collection.name"
+                label="Name"
+                variant="outlined"
+                required
+                hide-details
+                @keyup.enter="createCollection()"
+              />
+            </v-col>
+          </v-row>
+          <v-row class="pa-2" no-gutters>
+            <v-col>
+              <v-text-field
+                v-model="collection.description"
+                class="mt-1"
+                label="Description"
+                variant="outlined"
+                required
+                hide-details
+                @keyup.enter="createCollection()"
+              />
+            </v-col>
+          </v-row>
+        </v-col>
+        <v-col>
+          <v-row class="pa-2 justify-center" no-gutters>
+            <v-col class="cover">
+              <collection-card
+                :key="collection.updated_at"
+                :show-title="false"
+                :with-link="false"
+                :collection="collection"
+                :src="imagePreviewUrl"
+              >
+                <template #append-inner>
+                  <v-btn-group rounded="0" divided density="compact">
+                    <v-btn
+                      :disabled="!heartbeat.value.STEAMGRIDDB_ENABLED"
+                      size="small"
+                      class="translucent-dark"
+                      @click="
+                        emitter?.emit(
+                          'showSearchCoverDialog',
+                          collection.name as string
+                        )
+                      "
+                    >
+                      <v-icon size="large">mdi-image-search-outline</v-icon>
+                    </v-btn>
+                    <v-btn
+                      size="small"
+                      class="translucent-dark"
+                      @click="triggerFileInput"
+                    >
+                      <v-icon size="large">mdi-pencil</v-icon>
+                      <v-file-input
+                        id="file-input"
+                        v-model="collection.artwork"
+                        accept="image/*"
+                        hide-details
+                        class="file-input"
+                        @change="previewImage"
+                      />
+                    </v-btn>
+                    <v-btn
+                      size="small"
+                      class="translucent-dark"
+                      @click="removeArtwork"
+                    >
+                      <v-icon size="large" class="text-romm-red"
+                        >mdi-delete</v-icon
+                      >
+                    </v-btn>
+                  </v-btn-group>
+                </template>
+              </collection-card>
+            </v-col>
+          </v-row>
+        </v-col>
+      </v-row>
+    </template>
+    <template #append>
+      <v-row class="justify-center mt-4 mb-2" no-gutters>
+        <v-btn-group divided density="compact">
+          <v-btn class="bg-terciary" @click="closeDialog"> Cancel </v-btn>
+          <v-btn
+            class="bg-terciary text-romm-green"
+            :disabled="!collection.name"
+            :variant="!collection.name ? 'plain' : 'flat'"
+            @click="createCollection"
+          >
+            Create
+          </v-btn>
+        </v-btn-group>
+      </v-row>
+    </template>
+  </r-dialog>
+</template>
+<style scoped>
+.cover {
+  min-width: 240px;
+  min-height: 330px;
+  max-width: 240px;
+  max-height: 330px;
+}
+</style>
diff --git a/frontend/src/components/common/Collection/Dialog/DeleteCollection.vue b/frontend/src/components/common/Collection/Dialog/DeleteCollection.vue
new file mode 100644
index 000000000..2a3ae3bca
--- /dev/null
+++ b/frontend/src/components/common/Collection/Dialog/DeleteCollection.vue
@@ -0,0 +1,85 @@
+<script setup lang="ts">
+import RAvatar from "@/components/common/Collection/RAvatar.vue";
+import RDialog from "@/components/common/RDialog.vue";
+import collectionApi from "@/services/api/collection";
+import storeCollections, { type Collection } from "@/stores/collections";
+import type { Events } from "@/types/emitter";
+import type { Emitter } from "mitt";
+import { inject, ref } from "vue";
+import { useRouter } from "vue-router";
+import { useDisplay } from "vuetify";
+
+const router = useRouter();
+const { lgAndUp } = useDisplay();
+const collectionsStore = storeCollections();
+const collection = ref<Collection | null>(null);
+const show = ref(false);
+const emitter = inject<Emitter<Events>>("emitter");
+emitter?.on("showDeleteCollectionDialog", (collectionToDelete) => {
+  collection.value = collectionToDelete;
+  show.value = true;
+});
+
+async function deleteCollection() {
+  if (!collection.value) return;
+
+  show.value = false;
+  await collectionApi
+    .deleteCollection({ collection: collection.value })
+    .then((response) => {
+      emitter?.emit("snackbarShow", {
+        msg: response.data.msg,
+        icon: "mdi-check-bold",
+        color: "green",
+      });
+    })
+    .catch((error) => {
+      console.log(error);
+      emitter?.emit("snackbarShow", {
+        msg: error.response.data.detail,
+        icon: "mdi-close-circle",
+        color: "red",
+      });
+      return;
+    });
+
+  await router.push({ name: "dashboard" });
+
+  collectionsStore.remove(collection.value);
+  emitter?.emit("refreshDrawer", null);
+  closeDialog();
+}
+
+function closeDialog() {
+  show.value = false;
+}
+</script>
+<template>
+  <r-dialog
+    v-if="collection"
+    @close="closeDialog"
+    v-model="show"
+    icon="mdi-delete"
+    scroll-content
+    :width="lgAndUp ? '50vw' : '95vw'"
+  >
+    <template #content>
+      <v-row class="justify-center align-center pa-2" no-gutters>
+        <span>Removing collection</span>
+        <r-avatar class="ml-1" :collection="collection" />
+        <span class="ml-1 text-romm-accent-1">{{ collection.name }}</span>
+        <span class="ml-1">from RomM. Do you confirm?</span>
+      </v-row>
+    </template>
+    <template #append>
+      <v-row class="justify-center pa-2" no-gutters>
+        <v-btn-group divided density="compact">
+          <v-btn class="bg-terciary" @click="closeDialog"> Cancel </v-btn>
+          <v-btn class="bg-terciary text-romm-red" @click="deleteCollection">
+            Confirm
+          </v-btn>
+        </v-btn-group>
+      </v-row>
+    </template>
+  </r-dialog>
+</template>
diff --git a/frontend/src/components/common/Collection/Dialog/EditCollection.vue b/frontend/src/components/common/Collection/Dialog/EditCollection.vue
new file mode 100644
index 000000000..1977f8115
--- /dev/null
+++ b/frontend/src/components/common/Collection/Dialog/EditCollection.vue
@@ -0,0 +1,210 @@
+<script setup lang="ts">
+import CollectionCard from "@/components/common/Collection/Card.vue";
+import RDialog from "@/components/common/RDialog.vue";
+import type { UpdatedCollection } from "@/services/api/collection";
+import collectionApi from "@/services/api/collection";
+import collectionStore, { type Collection } from "@/stores/collections";
+import storeHeartbeat from "@/stores/heartbeat";
+import type { Events } from "@/types/emitter";
+import type { Emitter } from "mitt";
+import { inject, ref } from "vue";
+import { useDisplay, useTheme } from "vuetify";
+
+// Props
+const theme = useTheme();
+const { mdAndUp } = useDisplay();
+const show = ref(false);
+const storeCollection = collectionStore();
+const collection = ref<UpdatedCollection>({} as UpdatedCollection);
+const imagePreviewUrl = ref<string | undefined>("");
+const removeCover = ref(false);
+const heartbeat = storeHeartbeat();
+const emitter = inject<Emitter<Events>>("emitter");
+emitter?.on("showEditCollectionDialog", (collectionToEdit: Collection) => {
+  collection.value = collectionToEdit;
+  show.value = true;
+});
+emitter?.on("updateUrlCover", (url_cover) => {
+  if (!collection.value) return;
+  collection.value.url_cover = url_cover;
+  imagePreviewUrl.value = url_cover;
+});
+
+// Functions
+function triggerFileInput() {
+  const fileInput = document.getElementById("file-input");
+  fileInput?.click();
+}
+
+function previewImage(event: Event) {
+  const input = event.target as HTMLInputElement;
+  if (!input.files) return;
+
+  const reader = new FileReader();
+  reader.onload = () => {
+    imagePreviewUrl.value = reader.result?.toString();
+  };
+  if (input.files[0]) {
+    reader.readAsDataURL(input.files[0]);
+  }
+}
+
+async function removeArtwork() {
+  imagePreviewUrl.value = `/assets/default/cover/big_${theme.global.name.value}_collection.png`;
+  removeCover.value = true;
+}
+
+async function editCollection() {
+  if (!collection.value) return;
+
+  emitter?.emit("showLoadingDialog", { loading: true, scrim: true });
+
+  await collectionApi
+    .updateCollection({
+      collection: collection.value,
+    })
+    .then(({ data }) => {
+      storeCollection.update(data);
+      emitter?.emit("snackbarShow", {
+        msg: `Collection updated successfully!`,
+        icon: "mdi-check-bold",
+        color: "green",
+        timeout: 2000,
+      });
+    })
+    .catch((error) => {
+      console.log(error);
+      emitter?.emit("snackbarShow", {
+        msg: error.response.data.detail,
+        icon: "mdi-close-circle",
+        color: "red",
+      });
+    })
+    .finally(() => {
+      emitter?.emit("showLoadingDialog", { loading: false, scrim: false });
+      closeDialog();
+    });
+}
+
+function closeDialog() {
+  show.value = false;
+  collection.value = {} as UpdatedCollection;
+  imagePreviewUrl.value = "";
+}
+</script>
+
+<template>
+  <r-dialog
+    v-if="collection"
+    @close="closeDialog"
+    v-model="show"
+    icon="mdi-pencil-box"
+    :width="mdAndUp ? '55vw' : '95vw'"
+  >
+    <template #content>
+      <v-row class="align-center pa-2" no-gutters>
+        <v-col cols="12" lg="7" xl="9">
+          <v-row class="pa-2" no-gutters>
+            <v-col>
+              <v-text-field
+                v-model="collection.name"
+                class="py-2"
+                label="Name"
+                variant="outlined"
+                required
+                hide-details
+                @keyup.enter="editCollection"
+              />
+            </v-col>
+          </v-row>
+          <v-row class="pa-2" no-gutters>
+            <v-col>
+              <v-text-field
+                v-model="collection.description"
+                class="py-2"
+                label="Description"
+                variant="outlined"
+                required
+                hide-details
+                @keyup.enter="editCollection"
+              />
+            </v-col>
+          </v-row>
+        </v-col>
+        <v-col>
+          <v-row class="pa-2 justify-center" no-gutters>
+            <v-col class="cover">
+              <collection-card
+                :key="collection.updated_at"
+                :show-title="false"
+                :with-link="false"
+                :collection="collection"
+                :src="imagePreviewUrl"
+              >
+                <template #append-inner>
+                  <v-btn-group rounded="0" divided density="compact">
+                    <v-btn
+                      :disabled="!heartbeat.value.STEAMGRIDDB_ENABLED"
+                      size="small"
+                      class="translucent-dark"
+                      @click="
+                        emitter?.emit(
+                          'showSearchCoverDialog',
+                          collection.name as string
+                        )
+                      "
+                    >
+                      <v-icon size="large">mdi-image-search-outline</v-icon>
+                    </v-btn>
+                    <v-btn
+                      size="small"
+                      class="translucent-dark"
+                      @click="triggerFileInput"
+                    >
+                      <v-icon size="large">mdi-pencil</v-icon>
+                      <v-file-input
+                        id="file-input"
+                        v-model="collection.artwork"
+                        accept="image/*"
+                        hide-details
+                        class="file-input"
+                        @change="previewImage"
+                      />
+                    </v-btn>
+                    <v-btn
+                      size="small"
+                      class="translucent-dark"
+                      @click="removeArtwork"
+                    >
+                      <v-icon size="large" class="text-romm-red"
+                        >mdi-delete</v-icon
+                      >
+                    </v-btn>
+                  </v-btn-group>
+                </template>
+              </collection-card>
+            </v-col>
+          </v-row>
+        </v-col>
+      </v-row>
+    </template>
+    <template #append>
+      <v-row class="justify-center mt-4 mb-2" no-gutters>
+        <v-btn-group divided density="compact">
+          <v-btn class="bg-terciary" @click="closeDialog"> Cancel </v-btn>
+          <v-btn class="text-romm-green bg-terciary" @click="editCollection">
+            Update
+          </v-btn>
+        </v-btn-group>
+      </v-row>
+    </template>
+  </r-dialog>
+</template>
+<style scoped>
+.cover {
+  min-width: 240px;
+  min-height: 330px;
+  max-width: 240px;
+  max-height: 330px;
+}
+</style>
diff --git a/frontend/src/components/common/Collection/Dialog/RemoveRoms.vue b/frontend/src/components/common/Collection/Dialog/RemoveRoms.vue
new file mode 100644
index 000000000..1d96e596d
--- /dev/null
+++ b/frontend/src/components/common/Collection/Dialog/RemoveRoms.vue
@@ -0,0 +1,175 @@
+<script setup lang="ts">
+import RAvatarRom from "@/components/common/Game/RAvatar.vue";
+import RDialog from "@/components/common/RDialog.vue";
+import router from "@/plugins/router";
+import collectionApi from "@/services/api/collection";
+import type { Collection } from "@/stores/collections";
+import storeRoms, { type SimpleRom } from "@/stores/roms";
+import type { Events } from "@/types/emitter";
+import type { Emitter } from "mitt";
+import { inject, ref, watch } from "vue";
+import { useDisplay } from "vuetify";
+
+// Props
+const { mdAndUp } = useDisplay();
+const show = ref(false);
+const romsStore = storeRoms();
+const selectedCollection = ref<Collection>();
+const roms = ref<SimpleRom[]>([]);
+const emitter = inject<Emitter<Events>>("emitter");
+emitter?.on("showRemoveFromCollectionDialog", (romsToRemove) => {
+  roms.value = romsToRemove;
+  selectedCollection.value = romsStore.currentCollection as Collection;
+  updateDataTablePages();
+  show.value = true;
+});
+const HEADERS = [
+  {
+    title: "Name",
+    align: "start",
+    sortable: true,
+    key: "name",
+  },
+] as const;
+const page = ref(1);
+const itemsPerPage = ref(10);
+const pageCount = ref(0);
+const PER_PAGE_OPTIONS = [10, 25, 50, 100];
+
+// Functions
+async function removeRomsFromCollection() {
+  if (!selectedCollection.value) return;
+  selectedCollection.value.roms = selectedCollection.value.roms.filter(
+    (id) => !roms.value.map((r) => r.id).includes(id)
+  );
+  await collectionApi
+    .updateCollection({ collection: selectedCollection.value })
+    .then(({ data }) => {
+      emitter?.emit("snackbarShow", {
+        msg: `Roms removed from ${selectedCollection.value?.name} successfully!`,
+        icon: "mdi-check-bold",
+        color: "green",
+        timeout: 2000,
+      });
+      romsStore.remove(roms.value);
+      emitter?.emit("refreshDrawer", null);
+    })
+    .catch((error) => {
+      console.log(error);
+      emitter?.emit("snackbarShow", {
+        msg: error.response.data.detail,
+        icon: "mdi-close-circle",
+        color: "red",
+      });
+      return;
+    })
+    .finally(() => {
+      emitter?.emit("showLoadingDialog", { loading: false, scrim: false });
+      romsStore.resetSelection();
+      if (selectedCollection.value?.roms.length == 0) {
+        router.push({ name: "dashboard" });
+      }
+      closeDialog();
+    });
+}
+
+function updateDataTablePages() {
+  pageCount.value = Math.ceil(roms.value.length / itemsPerPage.value);
+}
+
+watch(itemsPerPage, async () => {
+  updateDataTablePages();
+});
+
+function closeDialog() {
+  roms.value = [];
+  show.value = false;
+  selectedCollection.value = undefined;
+}
+</script>
+
+<template>
+  <r-dialog
+    @close="closeDialog"
+    v-model="show"
+    icon="mdi-bookmark-remove-outline"
+    scroll-content
+    :width="mdAndUp ? '45vw' : '95vw'"
+  >
+    <template #header>
+      <v-row no-gutters class="justify-center">
+        <span>Removing</span>
+        <span class="text-romm-accent-1 mx-1">{{ roms.length }}</span>
+        <span>games from</span>
+        <span class="text-romm-accent-1 mx-1">{{
+          selectedCollection?.name
+        }}</span>
+        <span>collection.</span>
+      </v-row>
+    </template>
+    <template #content>
+      <v-data-table
+        :item-value="(item) => item.id"
+        :items="roms"
+        :width="mdAndUp ? '60vw' : '95vw'"
+        :items-per-page="itemsPerPage"
+        :items-per-page-options="PER_PAGE_OPTIONS"
+        :headers="HEADERS"
+        v-model:page="page"
+        hide-default-header
+      >
+        <template #item.name="{ item }">
+          <v-list-item class="px-0">
+            <template #prepend>
+              <r-avatar-rom :rom="item" />
+            </template>
+            <v-row no-gutters
+              ><v-col>{{ item.name }}</v-col></v-row
+            >
+          </v-list-item>
+        </template>
+        <template #bottom>
+          <v-divider />
+          <v-row no-gutters class="pt-2 align-center justify-center">
+            <v-col class="px-6">
+              <v-pagination
+                v-model="page"
+                rounded="0"
+                :show-first-last-page="true"
+                active-color="romm-accent-1"
+                :length="pageCount"
+              />
+            </v-col>
+            <v-col cols="5" sm="3">
+              <v-select
+                v-model="itemsPerPage"
+                class="pa-2"
+                label="Roms per page"
+                density="compact"
+                variant="outlined"
+                :items="PER_PAGE_OPTIONS"
+                hide-details
+              />
+            </v-col>
+          </v-row>
+        </template>
+      </v-data-table>
+    </template>
+    <template #append>
+      <v-row class="justify-center my-2">
+        <v-btn-group divided density="compact">
+          <v-btn class="bg-terciary" @click="closeDialog" variant="flat">
+            Cancel
+          </v-btn>
+          <v-btn
+            class="bg-terciary text-romm-red"
+            variant="flat"
+            @click="removeRomsFromCollection"
+          >
+            Confirm
+          </v-btn>
+        </v-btn-group>
+      </v-row>
+    </template>
+  </r-dialog>
+</template>
diff --git a/frontend/src/components/common/Collection/ListItem.vue b/frontend/src/components/common/Collection/ListItem.vue
new file mode 100644
index 000000000..5e0f52f3f
--- /dev/null
+++ b/frontend/src/components/common/Collection/ListItem.vue
@@ -0,0 +1,42 @@
+<script setup lang="ts">
+import type { Collection } from "@/stores/collections";
+import RAvatar from "@/components/common/Collection/RAvatar.vue";
+
+// Props
+defineProps<{ collection: Collection }>();
+</script>
+
+<template>
+  <v-list-item
+    :key="collection.id"
+    :to="{ name: 'collection', params: { collection: collection.id } }"
+    :value="collection.name"
+  >
+    <template #prepend>
+      <r-avatar :collection="collection" />
+    </template>
+    <v-row no-gutters
+      ><v-col
+        ><span class="text-body-1">{{ collection.name }}</span></v-col
+      ></v-row
+    >
+    <v-row no-gutters>
+      <v-col>
+        <span class="text-caption text-grey">{{ collection.description }}</span>
+      </v-col>
+    </v-row>
+    <template #append>
+      <v-chip class="ml-2" size="x-small" label>
+        {{ collection.rom_count }}
+      </v-chip>
+    </template>
+  </v-list-item>
+</template>
+
+<style scoped>
+.not-found-icon {
+  position: absolute;
+  bottom: 0;
+  right: 0;
+}
+</style>
diff --git a/frontend/src/components/common/Collection/RAvatar.vue b/frontend/src/components/common/Collection/RAvatar.vue
new file mode 100644
index 000000000..d768fe069
--- /dev/null
+++ b/frontend/src/components/common/Collection/RAvatar.vue
@@ -0,0 +1,30 @@
+<script setup lang="ts">
+import type { Collection } from "@/stores/collections";
+import { useTheme } from "vuetify";
+
+withDefaults(defineProps<{ collection: Collection; size?: number }>(), {
+  size: 45,
+});
+const theme = useTheme();
+</script>
+
+<template>
+  <v-avatar :rounded="0" :size="size">
+    <v-img
+      :src="
+        !collection.has_cover
+          ? `/assets/default/cover/small_${theme.global.name.value}_collection.png`
+          : collection.has_cover
+          ? `/assets/romm/resources/${collection.path_cover_s}?ts=${collection.updated_at}`
+          : `/assets/default/cover/small_${theme.global.name.value}_collection.png`
+      "
+    >
+      <template #error>
+        <v-img
+          :src="`assets/default/cover/big_${theme.global.name.value}_collection.png`"
+        >
+        </v-img>
+      </template>
+    </v-img>
+  </v-avatar>
+</template>
diff --git a/frontend/src/components/common/EmptyCollection.vue b/frontend/src/components/common/EmptyCollection.vue
new file mode 100644
index 000000000..5185b2bb6
--- /dev/null
+++ b/frontend/src/components/common/EmptyCollection.vue
@@ -0,0 +1,8 @@
+<template>
+  <v-empty-state
+    headline="Whoops, 404"
+    title="Collection not found"
+    text="The collection you were looking for does not exist"
+    icon="mdi-rhombus-split"
+  ></v-empty-state>
+</template>
diff --git a/frontend/src/components/common/Game/AdminMenu.vue b/frontend/src/components/common/Game/AdminMenu.vue
index 2d4646beb..bc1dca9bd 100644
--- a/frontend/src/components/common/Game/AdminMenu.vue
+++ b/frontend/src/components/common/Game/AdminMenu.vue
@@ -1,66 +1,66 @@
 <script setup lang="ts">
-import { inject } from "vue";
-import type { Emitter } from "mitt";
-import type { Events } from "@/types/emitter";
-import type { SimpleRom } from "@/stores/roms";
+import storeAuth from "@/stores/auth";
 import storeHeartbeat from "@/stores/heartbeat";
+import type { SimpleRom } from "@/stores/roms";
+import type { Events } from "@/types/emitter";
+import type { Emitter } from "mitt";
+import { inject } from "vue";
 
 defineProps<{ rom: SimpleRom }>();
 const emitter = inject<Emitter<Events>>("emitter");
 const heartbeat = storeHeartbeat();
+const auth = storeAuth();
 </script>
 
 <template>
   <v-list rounded="0" class="pa-0">
+    <template v-if="auth.scopes.includes('roms.write')">
+      <v-list-item
+        :disabled="!heartbeat.value.ANY_SOURCE_ENABLED"
+        class="py-4 pr-5"
+        @click="emitter?.emit('showMatchRomDialog', rom)"
+      >
+        <v-list-item-title class="d-flex">
+          <v-icon icon="mdi-search-web" class="mr-2" />Manual match
+        </v-list-item-title>
+        <v-list-item-subtitle>
+          {{
+            !heartbeat.value.ANY_SOURCE_ENABLED
+              ? "No metadata source enabled"
+              : ""
+          }}
+        </v-list-item-subtitle>
+      </v-list-item>
+      <v-list-item
+        class="py-4 pr-5"
+        @click="emitter?.emit('showEditRomDialog', { ...rom })"
+      >
+        <v-list-item-title class="d-flex">
+          <v-icon icon="mdi-pencil-box" class="mr-2" />Edit
+        </v-list-item-title>
+      </v-list-item>
+      <v-divider />
+    </template>
     <v-list-item
-      :disabled="!heartbeat.value.ANY_SOURCE_ENABLED"
+      v-if="auth.scopes.includes('collections.write')"
       class="py-4 pr-5"
-      @click="emitter?.emit('showMatchRomDialog', rom)"
-    >
-      <v-list-item-title class="d-flex">
-        <v-icon icon="mdi-search-web" class="mr-2" />Manual match
-      </v-list-item-title>
-      <v-list-item-subtitle>
-        {{
-          !heartbeat.value.ANY_SOURCE_ENABLED
-            ? "No metadata source enabled"
-            : ""
-        }}
-      </v-list-item-subtitle>
-    </v-list-item>
-
-    <v-list-item
-      :disabled="!heartbeat.value.STEAMGRIDDB_ENABLED"
-      class="py-4 pr-5"
-      @click="emitter?.emit('showSearchCoverDialog', rom)"
-    >
-      <v-list-item-title class="d-flex">
-        <v-icon icon="mdi-image-outline" class="mr-2" />Cover search
-      </v-list-item-title>
-      <v-list-item-subtitle>
-        {{
-          !heartbeat.value.STEAMGRIDDB_ENABLED ? "SteamgridDB is not enabled" : ""
-        }}
-      </v-list-item-subtitle>
-    </v-list-item>
-
-    <v-divider />
-    <v-list-item
-      class="py-4 pr-5"
-      @click="emitter?.emit('showEditRomDialog', { ...rom })"
-    >
-      <v-list-item-title class="d-flex">
-        <v-icon icon="mdi-pencil-box" class="mr-2" />Edit
-      </v-list-item-title>
-    </v-list-item>
-    <v-divider />
-    <v-list-item
-      class="py-4 pr-5 text-romm-red"
-      @click="emitter?.emit('showDeleteRomDialog', [rom])"
+      @click="emitter?.emit('showAddToCollectionDialog', [{ ...rom }])"
     >
       <v-list-item-title class="d-flex">
-        <v-icon icon="mdi-delete" class="mr-2" />Delete
+        <v-icon icon="mdi-bookmark-plus-outline" class="mr-2" />Add to
+        collection
       </v-list-item-title>
     </v-list-item>
+    <template v-if="auth.scopes.includes('roms.write')">
+      <v-divider />
+      <v-list-item
+        class="py-4 pr-5 text-romm-red"
+        @click="emitter?.emit('showDeleteRomDialog', [rom])"
+      >
+        <v-list-item-title class="d-flex">
+          <v-icon icon="mdi-delete" class="mr-2" />Delete
+        </v-list-item-title>
+      </v-list-item>
+    </template>
   </v-list>
 </template>
diff --git a/frontend/src/components/common/Game/Card/ActionBar.vue b/frontend/src/components/common/Game/Card/ActionBar.vue
index 255bb21fa..618f54621 100644
--- a/frontend/src/components/common/Game/Card/ActionBar.vue
+++ b/frontend/src/components/common/Game/Card/ActionBar.vue
@@ -1,19 +1,13 @@
 <script setup lang="ts">
+import AdminMenu from "@/components/common/Game/AdminMenu.vue";
 import romApi from "@/services/api/rom";
 import storeDownload from "@/stores/download";
-import storeAuth from "@/stores/auth";
-import AdminMenu from "@/components/common/Game/AdminMenu.vue";
-import storeGalleryView from "@/stores/galleryView";
 import type { SimpleRom } from "@/stores/roms";
 import { isEmulationSupported } from "@/utils";
-import { storeToRefs } from "pinia";
 
 // Props
 defineProps<{ rom: SimpleRom }>();
-const auth = storeAuth();
 const downloadStore = storeDownload();
-const galleryViewStore = storeGalleryView();
-const { currentView } = storeToRefs(galleryViewStore);
 </script>
 
 <template>
@@ -28,8 +22,8 @@ const { currentView } = storeToRefs(galleryViewStore);
         variant="text"
         @click="romApi.downloadRom({ rom })"
       />
-      </v-col>
-      <v-col>
+    </v-col>
+    <v-col>
       <v-btn
         v-if="isEmulationSupported(rom.platform_slug)"
         class="action-bar-btn-small"
@@ -48,7 +42,6 @@ const { currentView } = storeToRefs(galleryViewStore);
     <v-menu location="bottom">
       <template #activator="{ props }">
         <v-btn
-          v-if="auth.scopes.includes('roms.write')"
           class="action-bar-btn-small"
           size="x-small"
           v-bind="props"
diff --git a/frontend/src/components/common/Game/Card/Base.vue b/frontend/src/components/common/Game/Card/Base.vue
index a86e8e2bc..cf48b9901 100644
--- a/frontend/src/components/common/Game/Card/Base.vue
+++ b/frontend/src/components/common/Game/Card/Base.vue
@@ -15,6 +15,7 @@ const props = withDefaults(
     rom: SimpleRom | SearchRomSchema;
     transformScale?: boolean;
     titleOnHover?: boolean;
+    pointerOnHover?: boolean;
     titleOnFooter?: boolean;
     showActionBar?: boolean;
     withBorder?: boolean;
@@ -24,6 +25,7 @@ const props = withDefaults(
   {
     transformScale: false,
     titleOnHover: false,
+    pointerOnHover: true,
     titleOnFooter: false,
     showActionBar: false,
     withBorder: false,
@@ -65,7 +67,7 @@ onMounted(() => {
         'transform-scale': transformScale,
         'with-border': withBorder,
       }"
-      :elevation="isHovering && transformScale ? 20 : 2"
+      :elevation="isHovering && transformScale ? 20 : 3"
     >
       <v-progress-linear
         v-if="romsStore.isSimpleRom(rom)"
@@ -80,9 +82,10 @@ onMounted(() => {
           @touchstart="handleTouchStart"
           @touchend="handleTouchEnd"
           v-bind="hoverProps"
-          class="pointer"
+          :class="{ pointer: pointerOnHover }"
           ref="card"
           cover
+          :key="romsStore.isSimpleRom(rom) ? rom.updated_at : ''"
           :src="
             src
               ? src
@@ -205,7 +208,7 @@ onMounted(() => {
   -ms-user-select: none; /* Internet Explorer/Edge */
 }
 .append-inner {
-  bottom: -0.1rem;
-  right: -0.3rem;
+  bottom: 0rem;
+  right: 0rem;
 }
 </style>
diff --git a/frontend/src/components/common/Game/Card/Flags.vue b/frontend/src/components/common/Game/Card/Flags.vue
index ab6bf47ac..adeecfc12 100644
--- a/frontend/src/components/common/Game/Card/Flags.vue
+++ b/frontend/src/components/common/Game/Card/Flags.vue
@@ -41,7 +41,6 @@ const showSiblings = isNull(localStorage.getItem("settings.showSiblings"))
     </v-chip>
     <v-chip
       v-if="rom.siblings && rom.siblings.length > 0 && showSiblings"
-      :title="`${rom.siblings.length + 1} versions`"
       class="translucent-dark mr-1 mt-1"
       density="compact"
     >
diff --git a/frontend/src/components/common/Game/Dialog/DeleteRom.vue b/frontend/src/components/common/Game/Dialog/DeleteRom.vue
index 392e68fb8..371dbfac1 100644
--- a/frontend/src/components/common/Game/Dialog/DeleteRom.vue
+++ b/frontend/src/components/common/Game/Dialog/DeleteRom.vue
@@ -125,15 +125,7 @@ function closeDialog() {
         <template #item.name="{ item }">
           <v-list-item class="px-0">
             <template #prepend>
-              <r-avatar
-                :src="
-                  !item.igdb_id && !item.moby_id
-                    ? `/assets/default/cover/small_${theme.global.name.value}_unmatched.png`
-                    : item.has_cover
-                    ? `/assets/romm/resources/${item.path_cover_s}?ts=${item.updated_at}`
-                    : `/assets/default/cover/small_${theme.global.name.value}_missing_cover.png`
-                "
-              />
+              <r-avatar :rom="item" />
             </template>
             <v-row no-gutters
               ><v-col>{{ item.name }}</v-col></v-row
diff --git a/frontend/src/components/common/Game/Dialog/EditRom.vue b/frontend/src/components/common/Game/Dialog/EditRom.vue
index 212bc9183..cead8ebd0 100644
--- a/frontend/src/components/common/Game/Dialog/EditRom.vue
+++ b/frontend/src/components/common/Game/Dialog/EditRom.vue
@@ -2,15 +2,19 @@
 import GameCard from "@/components/common/Game/Card/Base.vue";
 import RDialog from "@/components/common/RDialog.vue";
 import romApi, { type UpdateRom } from "@/services/api/rom";
-import storeRoms from "@/stores/roms";
+import storeHeartbeat from "@/stores/heartbeat";
+import storeRoms, { type SimpleRom } from "@/stores/roms";
 import type { Events } from "@/types/emitter";
 import type { Emitter } from "mitt";
 import { inject, ref } from "vue";
+import { useRoute } from "vue-router";
 import { useDisplay, useTheme } from "vuetify";
 
 // Props
 const theme = useTheme();
-const { smAndDown, lgAndUp } = useDisplay();
+const { lgAndUp } = useDisplay();
+const heartbeat = storeHeartbeat();
+const route = useRoute();
 const show = ref(false);
 const rom = ref<UpdateRom>();
 const romsStore = storeRoms();
@@ -25,6 +29,11 @@ emitter?.on("showEditRomDialog", (romToEdit: UpdateRom | undefined) => {
   show.value = true;
   rom.value = romToEdit;
 });
+emitter?.on("updateUrlCover", (url_cover) => {
+  if (!rom.value) return;
+  rom.value.url_cover = url_cover;
+  imagePreviewUrl.value = url_cover;
+});
 
 // Functions
 function triggerFileInput() {
@@ -80,7 +89,10 @@ async function updateRom() {
         icon: "mdi-check-bold",
         color: "green",
       });
-      romsStore.update(data);
+      romsStore.update(data as SimpleRom);
+      if (route.name == "rom") {
+        romsStore.currentRom = data;
+      }
     })
     .catch((error) => {
       console.log(error);
@@ -163,14 +175,26 @@ function closeDialog() {
             <v-col class="cover">
               <game-card :rom="rom" :src="imagePreviewUrl">
                 <template #append-inner>
-                  <v-chip-group class="pa-0">
-                    <v-chip
+                  <v-btn-group rounded="0" divided density="compact">
+                    <v-btn
+                      :disabled="!heartbeat.value.STEAMGRIDDB_ENABLED"
+                      size="small"
+                      class="translucent-dark"
+                      @click="
+                        emitter?.emit(
+                          'showSearchCoverDialog',
+                          rom?.name as string
+                        )
+                      "
+                    >
+                      <v-icon size="large">mdi-image-search-outline</v-icon>
+                    </v-btn>
+                    <v-btn
+                      size="small"
                       class="translucent-dark"
-                      :size="smAndDown ? 'large' : 'small'"
                       @click="triggerFileInput"
-                      label
                     >
-                      <v-icon>mdi-pencil</v-icon>
+                      <v-icon size="large">mdi-pencil</v-icon>
                       <v-file-input
                         id="file-input"
                         v-model="rom.artwork"
@@ -179,16 +203,17 @@ function closeDialog() {
                         class="file-input"
                         @change="previewImage"
                       />
-                    </v-chip>
-                    <v-chip
+                    </v-btn>
+                    <v-btn
+                      size="small"
                       class="translucent-dark"
-                      :size="smAndDown ? 'large' : 'small'"
                       @click="removeArtwork"
-                      label
                     >
-                      <v-icon class="text-romm-red"> mdi-delete </v-icon>
-                    </v-chip>
-                  </v-chip-group>
+                      <v-icon size="large" class="text-romm-red"
+                        >mdi-delete</v-icon
+                      >
+                    </v-btn>
+                  </v-btn-group>
                 </template>
               </game-card>
             </v-col>
@@ -197,7 +222,7 @@ function closeDialog() {
       </v-row>
     </template>
     <template #append>
-      <v-row class="justify-center mb-2" no-gutters>
+      <v-row class="justify-center mt-4 mb-2" no-gutters>
         <v-btn-group divided density="compact">
           <v-btn class="bg-terciary" @click="closeDialog"> Cancel </v-btn>
           <v-btn class="text-romm-green bg-terciary" @click="updateRom">
diff --git a/frontend/src/components/common/Game/Dialog/MatchRom.vue b/frontend/src/components/common/Game/Dialog/MatchRom.vue
index 0caedd0ed..f17d19c32 100644
--- a/frontend/src/components/common/Game/Dialog/MatchRom.vue
+++ b/frontend/src/components/common/Game/Dialog/MatchRom.vue
@@ -8,6 +8,7 @@ import storeRoms, { type SimpleRom } from "@/stores/roms";
 import type { Events } from "@/types/emitter";
 import type { Emitter } from "mitt";
 import { inject, onBeforeUnmount, ref } from "vue";
+import { useRoute } from "vue-router";
 import { useDisplay, useTheme } from "vuetify";
 
 type MatchedSource = {
@@ -21,6 +22,7 @@ const show = ref(false);
 const rom = ref<SimpleRom | null>(null);
 const romsStore = storeRoms();
 const searching = ref(false);
+const route = useRoute();
 const searchTerm = ref("");
 const theme = useTheme();
 const searchBy = ref("Name");
@@ -39,7 +41,9 @@ emitter?.on("showMatchRomDialog", (romToSearch) => {
   rom.value = romToSearch;
   searchTerm.value = romToSearch.name || romToSearch.file_name_no_tags || "";
   show.value = true;
-  searchRom();
+  if (rom.value.igdb_id || rom.value.moby_id) {
+    searchRom();
+  }
 });
 
 // Functions
@@ -167,7 +171,10 @@ async function updateRom(selectedRom: SearchRomSchema) {
         icon: "mdi-check-bold",
         color: "green",
       });
-      romsStore.update(data);
+      romsStore.update(data as SimpleRom);
+      if (route.name == "rom") {
+        romsStore.currentRom = data;
+      }
     })
     .catch((error) => {
       emitter?.emit("snackbarShow", {
@@ -266,11 +273,13 @@ onBeforeUnmount(() => {
       <v-row class="align-center" no-gutters>
         <v-col cols="6" sm="8">
           <v-text-field
+            autofocus
             id="search-text-field"
             @keyup.enter="searchRom()"
             @click:clear="searchTerm = ''"
             class="bg-terciary"
             v-model="searchTerm"
+            :disabled="searching"
             label="Search"
             hide-details
             clearable
@@ -278,6 +287,7 @@ onBeforeUnmount(() => {
         </v-col>
         <v-col cols="4" sm="3">
           <v-select
+            :disabled="searching"
             label="by"
             class="bg-terciary"
             :items="['ID', 'Name']"
diff --git a/frontend/src/components/common/Game/Dialog/SearchRom.vue b/frontend/src/components/common/Game/Dialog/SearchRom.vue
index 86311a4d1..837b4b64b 100644
--- a/frontend/src/components/common/Game/Dialog/SearchRom.vue
+++ b/frontend/src/components/common/Game/Dialog/SearchRom.vue
@@ -117,6 +117,7 @@ onBeforeUnmount(() => {
             @keyup.enter="searchRoms"
             @click:clear="searchRoms"
             v-model="searchValue"
+            :disabled="searching"
             label="Search"
             hide-details
             class="bg-terciary"
@@ -128,7 +129,7 @@ onBeforeUnmount(() => {
             label="Platform"
             class="bg-terciary"
             item-title="platform_name"
-            :disabled="platforms.length == 0"
+            :disabled="platforms.length == 0 || searching"
             hide-details
             clearable
             single-line
diff --git a/frontend/src/components/common/Game/RAvatar.vue b/frontend/src/components/common/Game/RAvatar.vue
index e4a8d0f2c..bdc2c5fe0 100644
--- a/frontend/src/components/common/Game/RAvatar.vue
+++ b/frontend/src/components/common/Game/RAvatar.vue
@@ -1,9 +1,21 @@
 <script setup lang="ts">
-withDefaults(defineProps<{ src: string; size?: number }>(), { size: 45 });
+import type { SimpleRom } from "@/stores/roms";
+import { useTheme } from "vuetify";
+
+withDefaults(defineProps<{ rom: SimpleRom; size?: number }>(), { size: 45 });
+const theme = useTheme();
 </script>
 
 <template>
   <v-avatar :rounded="0" :size="size">
-    <v-img :src="src" />
+    <v-img
+      :src="
+        !rom.igdb_id && !rom.moby_id && !rom.has_cover
+          ? `/assets/default/cover/small_${theme.global.name.value}_unmatched.png`
+          : rom.has_cover
+          ? `/assets/romm/resources/${rom.path_cover_s}?ts=${rom.updated_at}`
+          : `/assets/default/cover/small_${theme.global.name.value}_missing_cover.png`
+      "
+    />
   </v-avatar>
 </template>
diff --git a/frontend/src/components/common/Game/Table.vue b/frontend/src/components/common/Game/Table.vue
index 2be0d1a15..b0529dcd3 100644
--- a/frontend/src/components/common/Game/Table.vue
+++ b/frontend/src/components/common/Game/Table.vue
@@ -2,7 +2,6 @@
 import AdminMenu from "@/components/common/Game/AdminMenu.vue";
 import RAvatar from "@/components/common/Game/RAvatar.vue";
 import romApi from "@/services/api/rom";
-import storeAuth from "@/stores/auth";
 import storeDownload from "@/stores/download";
 import storeRoms, { type SimpleRom } from "@/stores/roms";
 import type { Events } from "@/types/emitter";
@@ -30,7 +29,6 @@ const router = useRouter();
 const route = useRoute();
 const downloadStore = storeDownload();
 const romsStore = storeRoms();
-const auth = storeAuth();
 const page = ref(parseInt(window.location.hash.slice(1)) || 1);
 const storedRomsPerPage = parseInt(localStorage.getItem("romsPerPage") ?? "");
 const itemsPerPage = ref(isNaN(storedRomsPerPage) ? 25 : storedRomsPerPage);
@@ -120,15 +118,7 @@ onMounted(() => {
       <td class="name-row">
         <v-list-item class="px-0">
           <template #prepend>
-            <r-avatar
-              :src="
-                (!item.igdb_id && !item.moby_id) && !item.has_cover
-                  ? `/assets/default/cover/small_${theme.global.name.value}_unmatched.png`
-                  : item.has_cover
-                  ? `/assets/romm/resources/${item.path_cover_s}?ts=${item.updated_at}`
-                  : `/assets/default/cover/small_${theme.global.name.value}_missing_cover.png`
-              "
-            />
+            <r-avatar :rom="item" />
           </template>
           <v-row no-gutters
             ><v-col>{{ item.name }}</v-col></v-row
@@ -144,7 +134,7 @@ onMounted(() => {
               class="translucent-dark ml-2"
               size="x-small"
             >
-              <span class="text-caption">+{{ item.siblings.length + 1 }}</span>
+              <span class="text-caption">+{{ item.siblings.length }}</span>
             </v-chip>
           </template>
         </v-list-item>
@@ -189,11 +179,7 @@ onMounted(() => {
         </v-btn>
         <v-menu location="bottom">
           <template #activator="{ props }">
-            <v-btn
-              v-if="auth.scopes.includes('roms.write')"
-              v-bind="props"
-              size="small"
-            >
+            <v-btn v-bind="props" size="small">
               <v-icon>mdi-dots-vertical</v-icon>
             </v-btn>
           </template>
diff --git a/frontend/src/components/common/Navigation/CollectionsBtn.vue b/frontend/src/components/common/Navigation/CollectionsBtn.vue
new file mode 100644
index 000000000..476cad35b
--- /dev/null
+++ b/frontend/src/components/common/Navigation/CollectionsBtn.vue
@@ -0,0 +1,31 @@
+<script setup lang="ts">
+import storeNavigation from "@/stores/navigation";
+import storePlatforms from "@/stores/platforms";
+import { storeToRefs } from "pinia";
+import { useDisplay } from "vuetify";
+
+// Props
+withDefaults(
+  defineProps<{
+    block?: boolean;
+  }>(),
+  {
+    block: false,
+  }
+);
+const navigationStore = storeNavigation();
+const { activeCollectionsDrawer } = storeToRefs(navigationStore);
+</script>
+<template>
+  <v-btn
+    :block="block"
+    rounded="0"
+    variant="flat"
+    :color="activeCollectionsDrawer ? 'terciary' : ''"
+    icon
+    @click="navigationStore.switchActiveCollectionsDrawer"
+    ><v-icon :color="$route.name == 'collection' ? 'romm-accent-1' : ''"
+      >mdi-bookmark-box-multiple</v-icon
+    ></v-btn
+  >
+</template>
diff --git a/frontend/src/components/common/Navigation/CollectionsDrawer.vue b/frontend/src/components/common/Navigation/CollectionsDrawer.vue
new file mode 100644
index 000000000..c99ce09b3
--- /dev/null
+++ b/frontend/src/components/common/Navigation/CollectionsDrawer.vue
@@ -0,0 +1,81 @@
+<script setup lang="ts">
+import CollectionListItem from "@/components/common/Collection/ListItem.vue";
+import collectionApi from "@/services/api/collection";
+import storeCollections from "@/stores/collections";
+import storeNavigation from "@/stores/navigation";
+import type { Events } from "@/types/emitter";
+import type { Emitter } from "mitt";
+import { storeToRefs } from "pinia";
+import { inject, onMounted } from "vue";
+import { useDisplay } from "vuetify";
+
+// Props
+const navigationStore = storeNavigation();
+const { smAndDown } = useDisplay();
+const collectionsStore = storeCollections();
+const { filteredCollections, searchText } = storeToRefs(collectionsStore);
+const { activeCollectionsDrawer } = storeToRefs(navigationStore);
+const emitter = inject<Emitter<Events>>("emitter");
+
+// Functions
+async function addCollection() {
+  emitter?.emit("showCreateCollectionDialog", null);
+}
+
+function clear() {
+  searchText.value = "";
+}
+
+onMounted(async () => {
+  await collectionApi
+    .getCollections()
+    .then(({ data: collections }) => {
+      collectionsStore.set(collections);
+    })
+    .catch((error) => {
+      console.error(error);
+    });
+});
+</script>
+<template>
+  <v-navigation-drawer
+    :location="smAndDown ? 'top' : 'left'"
+    mobile
+    width="400"
+    v-model="activeCollectionsDrawer"
+    class="bg-terciary"
+  >
+    <template #prepend>
+      <v-text-field
+        v-model="searchText"
+        prepend-inner-icon="mdi-filter-outline"
+        clearable
+        hide-details
+        @click:clear="clear"
+        @update:model-value=""
+        single-line
+        label="Search collection"
+        variant="solo-filled"
+        rounded="0"
+      ></v-text-field>
+    </template>
+    <v-list lines="two" rounded="0" class="pa-0">
+      <collection-list-item
+        v-for="collection in filteredCollections"
+        :collection="collection"
+      />
+    </v-list>
+    <template #append>
+      <v-btn
+        @click="addCollection()"
+        variant="tonal"
+        color="romm-accent-1"
+        prepend-icon="mdi-plus"
+        size="large"
+        rounded="0"
+        block
+        >Add Collection</v-btn
+      >
+    </template>
+  </v-navigation-drawer>
+</template>
diff --git a/frontend/src/components/common/Navigation/HomeBtn.vue b/frontend/src/components/common/Navigation/HomeBtn.vue
new file mode 100644
index 000000000..e88bc2158
--- /dev/null
+++ b/frontend/src/components/common/Navigation/HomeBtn.vue
@@ -0,0 +1,17 @@
+<script setup lang="ts">
+import RommIso from "@/components/common/RommIso.vue";
+import storeNavigation from "@/stores/navigation";
+
+const navigationStore = storeNavigation();
+</script>
+<template>
+  <v-hover v-slot="{ isHovering, props: hoverProps }">
+    <romm-iso
+      @click="navigationStore.goHome"
+      v-bind="hoverProps"
+      class="pointer"
+      :class="{ 'border-romm-accent-1': isHovering }"
+      :size="35"
+    />
+  </v-hover>
+</template>
diff --git a/frontend/src/components/common/Navigation/MainAppBar.vue b/frontend/src/components/common/Navigation/MainAppBar.vue
new file mode 100644
index 000000000..8cca01e2e
--- /dev/null
+++ b/frontend/src/components/common/Navigation/MainAppBar.vue
@@ -0,0 +1,32 @@
+<script setup lang="ts">
+import HomeBtn from "@/components/common/Navigation/HomeBtn.vue";
+import PlatformsBtn from "@/components/common/Navigation/PlatformsBtn.vue";
+import CollectionsBtn from "@/components/common/Navigation/CollectionsBtn.vue";
+import ScanBtn from "@/components/common/Navigation/ScanBtn.vue";
+import SearchBtn from "@/components/common/Navigation/SearchBtn.vue";
+import UploadBtn from "@/components/common/Navigation/UploadBtn.vue";
+import UserBtn from "@/components/common/Navigation/UserBtn.vue";
+</script>
+<template>
+  <v-app-bar
+    :elevation="0"
+    class="bg-primary justify-center px-1"
+    mode="shift"
+    height="45"
+  >
+    <template #prepend>
+      <home-btn />
+    </template>
+
+    <search-btn />
+    <platforms-btn />
+    <collections-btn />
+    <v-divider opacity="0" class="mx-3" vertical />
+    <upload-btn />
+    <scan-btn />
+    
+    <template #append>
+      <user-btn />
+    </template>
+  </v-app-bar>
+</template>
diff --git a/frontend/src/components/common/Navigation/MainDrawer.vue b/frontend/src/components/common/Navigation/MainDrawer.vue
new file mode 100644
index 000000000..57137581d
--- /dev/null
+++ b/frontend/src/components/common/Navigation/MainDrawer.vue
@@ -0,0 +1,45 @@
+<script setup lang="ts">
+import HomeBtn from "@/components/common/Navigation/HomeBtn.vue";
+import PlatformsBtn from "@/components/common/Navigation/PlatformsBtn.vue";
+import CollectionsBtn from "@/components/common/Navigation/CollectionsBtn.vue";
+import ScanBtn from "@/components/common/Navigation/ScanBtn.vue";
+import SearchBtn from "@/components/common/Navigation/SearchBtn.vue";
+import UploadBtn from "@/components/common/Navigation/UploadBtn.vue";
+import UserBtn from "@/components/common/Navigation/UserBtn.vue";
+import storeNavigation from "@/stores/navigation";
+import { storeToRefs } from "pinia";
+
+// Props
+const navigationStore = storeNavigation();
+const { activePlatformsDrawer, activeCollectionsDrawer, activeSettingsDrawer } =
+  storeToRefs(navigationStore);
+</script>
+<template>
+  <v-navigation-drawer
+    permanent
+    rail
+    :floating="
+      activePlatformsDrawer || activeCollectionsDrawer || activeSettingsDrawer
+    "
+    rail-width="60"
+  >
+    <template #prepend>
+      <v-row no-gutters class="my-2 justify-center">
+        <home-btn />
+      </v-row>
+    </template>
+
+    <v-divider opacity="0" class="my-4" />
+    <search-btn block />
+    <platforms-btn block />
+    <collections-btn block />
+    <v-divider opacity="0" class="my-3" />
+    <upload-btn block />
+    <scan-btn block />
+    <template #append>
+      <v-row no-gutters class="my-2 justify-center">
+        <user-btn />
+      </v-row>
+    </template>
+  </v-navigation-drawer>
+</template>
diff --git a/frontend/src/components/common/Navigation/PlatformsBtn.vue b/frontend/src/components/common/Navigation/PlatformsBtn.vue
new file mode 100644
index 000000000..6b1fcb34c
--- /dev/null
+++ b/frontend/src/components/common/Navigation/PlatformsBtn.vue
@@ -0,0 +1,28 @@
+<script setup lang="ts">
+import storeNavigation from "@/stores/navigation";
+import { storeToRefs } from "pinia";
+
+withDefaults(
+  defineProps<{
+    block?: boolean;
+  }>(),
+  {
+    block: false,
+  }
+);
+const navigationStore = storeNavigation();
+const { activePlatformsDrawer } = storeToRefs(navigationStore);
+</script>
+<template>
+  <v-btn
+    :block="block"
+    rounded="0"
+    variant="flat"
+    :color="activePlatformsDrawer ? 'terciary' : ''"
+    icon
+    @click="navigationStore.switchActivePlatformsDrawer"
+    ><v-icon :color="$route.name == 'platform' ? 'romm-accent-1' : ''"
+      >mdi-controller</v-icon
+    ></v-btn
+  >
+</template>
diff --git a/frontend/src/components/common/Navigation/PlatformsDrawer.vue b/frontend/src/components/common/Navigation/PlatformsDrawer.vue
new file mode 100644
index 000000000..96b04f984
--- /dev/null
+++ b/frontend/src/components/common/Navigation/PlatformsDrawer.vue
@@ -0,0 +1,52 @@
+<script setup lang="ts">
+import PlatformListItem from "@/components/common/Platform/ListItem.vue";
+import storeNavigation from "@/stores/navigation";
+import storePlatforms from "@/stores/platforms";
+import { storeToRefs } from "pinia";
+import { useDisplay } from "vuetify";
+
+// Props
+const navigationStore = storeNavigation();
+const { smAndDown } = useDisplay();
+const platformsStore = storePlatforms();
+const { filteredPlatforms, searchText } = storeToRefs(platformsStore);
+const { activePlatformsDrawer } = storeToRefs(navigationStore);
+
+// Functions
+function clear() {
+  searchText.value = "";
+}
+</script>
+<template>
+  <v-navigation-drawer
+    :location="smAndDown ? 'top' : 'left'"
+    mobile
+    @update:model-value="clear"
+    width="400"
+    v-model="activePlatformsDrawer"
+    class="bg-terciary"
+  >
+    <template #prepend>
+      <v-text-field
+        v-model="searchText"
+        prepend-inner-icon="mdi-filter-outline"
+        clearable
+        hide-details
+        @click:clear="clear"
+        @update:model-value=""
+        single-line
+        label="Search platform"
+        variant="solo-filled"
+        rounded="0"
+      ></v-text-field>
+    </template>
+    <v-list lines="two" rounded="0" class="pa-0">
+      <platform-list-item
+        v-for="platform in filteredPlatforms"
+        :key="platform.slug"
+        :platform="platform"
+        class="py-4"
+      />
+    </v-list>
+  </v-navigation-drawer>
+</template>
diff --git a/frontend/src/components/common/Navigation/ScanBtn.vue b/frontend/src/components/common/Navigation/ScanBtn.vue
new file mode 100644
index 000000000..b3482c616
--- /dev/null
+++ b/frontend/src/components/common/Navigation/ScanBtn.vue
@@ -0,0 +1,126 @@
+<script setup lang="ts">
+import socket from "@/services/socket";
+import storeAuth from "@/stores/auth";
+import storeGalleryFilter from "@/stores/galleryFilter";
+import storeNavigation from "@/stores/navigation";
+import storeRoms, { type SimpleRom } from "@/stores/roms";
+import storeScanning from "@/stores/scanning";
+import type { Events } from "@/types/emitter";
+import { normalizeString } from "@/utils";
+import type { Emitter } from "mitt";
+import { storeToRefs } from "pinia";
+import { inject, onBeforeUnmount } from "vue";
+
+// Props
+withDefaults(
+  defineProps<{
+    block?: boolean;
+  }>(),
+  {
+    block: false,
+  }
+);
+const navigationStore = storeNavigation();
+const auth = storeAuth();
+const galleryFilter = storeGalleryFilter();
+const isFiltered = normalizeString(galleryFilter.filterSearch).trim() != "";
+const emitter = inject<Emitter<Events>>("emitter");
+const scanningStore = storeScanning();
+const { scanningPlatforms } = storeToRefs(scanningStore);
+const romsStore = storeRoms();
+const { scanning } = storeToRefs(scanningStore);
+// Connect to socket on load to catch running scans
+if (!socket.connected) socket.connect();
+
+socket.on(
+  "scan:scanning_platform",
+  ({ name, slug, id }: { name: string; slug: string; id: number }) => {
+    scanningStore.set(true);
+    scanningPlatforms.value = scanningPlatforms.value.filter(
+      (platform) => platform.name !== name
+    );
+    scanningPlatforms.value.push({ name, slug, id, roms: [] });
+  }
+);
+
+socket.on("scan:scanning_rom", (rom: SimpleRom) => {
+  scanningStore.set(true);
+  if (romsStore.currentPlatform?.id === rom.platform_id) {
+    romsStore.add([rom]);
+    romsStore.setFiltered(
+      isFiltered ? romsStore.filteredRoms : romsStore.allRoms,
+      galleryFilter
+    );
+  }
+
+  let scannedPlatform = scanningPlatforms.value.find(
+    (p) => p.slug === rom.platform_slug
+  );
+
+  // Add the platform if the socket dropped and it's missing
+  if (!scannedPlatform) {
+    scanningPlatforms.value.push({
+      name: rom.platform_name,
+      slug: rom.platform_slug,
+      id: rom.platform_id,
+      roms: [],
+    });
+    scannedPlatform = scanningPlatforms.value[0];
+  }
+
+  scannedPlatform?.roms.push(rom);
+});
+
+socket.on("scan:done", () => {
+  scanningStore.set(false);
+  socket.disconnect();
+
+  emitter?.emit("refreshDrawer", null);
+  emitter?.emit("snackbarShow", {
+    msg: "Scan completed successfully!",
+    icon: "mdi-check-bold",
+    color: "green",
+    timeout: 4000,
+  });
+});
+
+socket.on("scan:done_ko", (msg) => {
+  scanningStore.set(false);
+
+  emitter?.emit("snackbarShow", {
+    msg: `Scan failed: ${msg}`,
+    icon: "mdi-close-circle",
+    color: "red",
+  });
+  socket.disconnect();
+});
+
+onBeforeUnmount(() => {
+  socket.off("scan:scanning_platform");
+  socket.off("scan:scanning_rom");
+  socket.off("scan:done");
+  socket.off("scan:done_ko");
+});
+</script>
+<template>
+  <v-btn
+    v-if="auth.scopes.includes('platforms.write')"
+    :block="block"
+    rounded="0"
+    variant="flat"
+    color="primary"
+    icon
+    @click="navigationStore.goScan"
+  >
+    <v-progress-circular
+      v-if="scanning"
+      color="romm-accent-1"
+      :width="2"
+      :size="20"
+      indeterminate
+    />
+    <v-icon v-else :color="$route.name == 'scan' ? 'romm-accent-1' : ''"
+      >mdi-magnify-scan</v-icon
+    >
+  </v-btn>
+</template>
diff --git a/frontend/src/components/common/Navigation/SearchBtn.vue b/frontend/src/components/common/Navigation/SearchBtn.vue
new file mode 100644
index 000000000..d29ebc339
--- /dev/null
+++ b/frontend/src/components/common/Navigation/SearchBtn.vue
@@ -0,0 +1,15 @@
+<script setup lang="ts">
+import type { Events } from "@/types/emitter";
+import type { Emitter } from "mitt";
+import { inject } from "vue";
+
+const emitter = inject<Emitter<Events>>("emitter");
+</script>
+<template>
+  <v-btn
+    icon="mdi-magnify"
+    variant="flat"
+    rounded="0"
+    @click="emitter?.emit('showSearchRomDialog', null)"
+  />
+</template>
diff --git a/frontend/src/components/common/Navigation/SettingsDrawer.vue b/frontend/src/components/common/Navigation/SettingsDrawer.vue
new file mode 100644
index 000000000..4e6f2bff5
--- /dev/null
+++ b/frontend/src/components/common/Navigation/SettingsDrawer.vue
@@ -0,0 +1,100 @@
+<script setup lang="ts">
+import identityApi from "@/services/api/identity";
+import storeAuth from "@/stores/auth";
+import storeNavigation from "@/stores/navigation";
+import type { Events } from "@/types/emitter";
+import { defaultAvatarPath } from "@/utils";
+import type { Emitter } from "mitt";
+import { storeToRefs } from "pinia";
+import { inject } from "vue";
+import { useRouter } from "vue-router";
+import { useDisplay } from "vuetify";
+
+// Props
+const navigationStore = storeNavigation();
+const router = useRouter();
+const auth = storeAuth();
+const emitter = inject<Emitter<Events>>("emitter");
+const { activeSettingsDrawer } = storeToRefs(navigationStore);
+const { smAndDown } = useDisplay();
+
+// Functions
+async function logout() {
+  identityApi
+    .logout()
+    .then(({ data }) => {
+      emitter?.emit("snackbarShow", {
+        msg: data.msg,
+        icon: "mdi-check-bold",
+        color: "green",
+      });
+      router.push({ name: "login" });
+    })
+    .catch(() => {
+      router.push({ name: "login" });
+    })
+    .finally(() => {
+      auth.setUser(null);
+    });
+}
+</script>
+<template>
+  <v-navigation-drawer
+    :location="smAndDown ? 'top' : 'left'"
+    mobile
+    width="400"
+    v-model="activeSettingsDrawer"
+    class="bg-terciary"
+  >
+    <v-list rounded="0" class="pa-0">
+      <v-list-img>
+        <v-img
+          :src="
+            auth.user?.avatar_path
+              ? `/assets/romm/assets/${auth.user?.avatar_path}?ts=${auth.user?.updated_at}`
+              : defaultAvatarPath
+          "
+          cover
+        >
+        </v-img>
+      </v-list-img>
+      <v-list-item
+        :title="auth.user?.username"
+        :subtitle="auth.user?.role"
+        class="mb-1 text-shadow text-white"
+      >
+      </v-list-item>
+    </v-list>
+    <v-list rounded="0" class="pa-0">
+      <v-list-item :to="{ name: 'settings' }" append-icon="mdi-palette"
+        >UI Settings</v-list-item
+      >
+      <v-list-item
+        v-if="auth.scopes.includes('platforms.write')"
+        append-icon="mdi-table-cog"
+        :to="{ name: 'management' }"
+        >Library Management
+      </v-list-item>
+      <v-list-item
+        v-if="auth.scopes.includes('users.write')"
+        :to="{ name: 'administration' }"
+        append-icon="mdi-security"
+        >Administration</v-list-item
+      >
+      <template v-if="smAndDown">
+        <v-divider />
+        <v-list-item @click="logout" append-icon="mdi-location-exit"
+          >Logout</v-list-item
+        >
+      </template>
+    </v-list>
+    <template v-if="!smAndDown" #append>
+      <v-list rounded="0" class="pa-0">
+        <v-divider />
+        <v-list-item @click="logout" append-icon="mdi-location-exit"
+          >Logout</v-list-item
+        >
+      </v-list>
+    </template>
+  </v-navigation-drawer>
+</template>
diff --git a/frontend/src/components/common/Navigation/UploadBtn.vue b/frontend/src/components/common/Navigation/UploadBtn.vue
new file mode 100644
index 000000000..c8ae3d383
--- /dev/null
+++ b/frontend/src/components/common/Navigation/UploadBtn.vue
@@ -0,0 +1,19 @@
+<script setup lang="ts">
+import storeAuth from "@/stores/auth";
+import type { Events } from "@/types/emitter";
+import type { Emitter } from "mitt";
+import { inject } from "vue";
+
+// Props
+const emitter = inject<Emitter<Events>>("emitter");
+const auth = storeAuth();
+</script>
+<template>
+  <v-btn
+    v-if="auth.scopes.includes('roms.write')"
+    icon="mdi-upload"
+    variant="flat"
+    rounded="0"
+    @click="emitter?.emit('showUploadRomDialog', null)"
+  />
+</template>
diff --git a/frontend/src/components/common/Navigation/UserBtn.vue b/frontend/src/components/common/Navigation/UserBtn.vue
new file mode 100644
index 000000000..c5b98fda1
--- /dev/null
+++ b/frontend/src/components/common/Navigation/UserBtn.vue
@@ -0,0 +1,30 @@
+<script setup lang="ts">
+import storeAuth from "@/stores/auth";
+import storeNavigation from "@/stores/navigation";
+import { defaultAvatarPath } from "@/utils";
+import { storeToRefs } from "pinia";
+
+// Props
+const navigationStore = storeNavigation();
+const auth = storeAuth();
+const { user } = storeToRefs(auth);
+</script>
+<template>
+  <v-hover v-slot="{ isHovering, props: hoverProps }">
+    <v-avatar
+      @click="navigationStore.switchActiveSettingsDrawer"
+      class="pointer"
+      size="35"
+      v-bind="hoverProps"
+      :class="{ 'border-romm-accent-1': isHovering }"
+    >
+      <v-img
+        :src="
+          user?.avatar_path
+            ? `/assets/romm/assets/${user?.avatar_path}?ts=${user?.updated_at}`
+            : defaultAvatarPath
+        "
+      />
+    </v-avatar>
+  </v-hover>
+</template>
diff --git a/frontend/src/components/common/Platform/Card.vue b/frontend/src/components/common/Platform/Card.vue
index 30aef3983..42a6b74be 100644
--- a/frontend/src/components/common/Platform/Card.vue
+++ b/frontend/src/components/common/Platform/Card.vue
@@ -20,7 +20,7 @@ defineProps<{ platform: Platform }>();
             :title="platform.name?.toString()"
             class="px-2 text-truncate text-caption"
           >
-            {{ platform.name }}
+            <span>{{ platform.name }}</span>
           </div>
         </v-row>
         <v-row class="pa-1 justify-center">
diff --git a/frontend/src/components/common/Platform/ListItem.vue b/frontend/src/components/common/Platform/ListItem.vue
index 79cb7baa2..384159ce2 100644
--- a/frontend/src/components/common/Platform/ListItem.vue
+++ b/frontend/src/components/common/Platform/ListItem.vue
@@ -36,7 +36,7 @@ withDefaults(defineProps<{ platform: Platform; rail?: boolean }>(), {
     </template>
     <v-row no-gutters
       ><v-col
-        ><span class="text-body-2">{{ platform.name }}</span></v-col
+        ><span class="text-body-1">{{ platform.name }}</span></v-col
       ></v-row
     >
     <v-row no-gutters>
diff --git a/frontend/src/components/common/Game/Dialog/SearchCoverRom.vue b/frontend/src/components/common/SearchCover.vue
similarity index 70%
rename from frontend/src/components/common/Game/Dialog/SearchCoverRom.vue
rename to frontend/src/components/common/SearchCover.vue
index 4f69673ed..c8c655ca3 100644
--- a/frontend/src/components/common/Game/Dialog/SearchCoverRom.vue
+++ b/frontend/src/components/common/SearchCover.vue
@@ -1,8 +1,7 @@
 <script setup lang="ts">
 import type { SearchCoverSchema } from "@/__generated__";
 import RDialog from "@/components/common/RDialog.vue";
-import romApi from "@/services/api/rom";
-import storeRoms, { type SimpleRom } from "@/stores/roms";
+import sgdbApi from "@/services/api/sgdb";
 import type { Events } from "@/types/emitter";
 import type { Emitter } from "mitt";
 import { inject, onBeforeUnmount, ref } from "vue";
@@ -11,27 +10,22 @@ import { useDisplay } from "vuetify";
 // Props
 const { lgAndUp } = useDisplay();
 const show = ref(false);
-const romsStore = storeRoms();
-const rom = ref<SimpleRom | null>(null);
 const searching = ref(false);
 const searchTerm = ref("");
-const games = ref<SearchCoverSchema[]>();
-const filteredGames = ref<SearchCoverSchema[]>();
+const coverType = ref("all");
+const covers = ref<SearchCoverSchema[]>([]);
+const filteredCovers = ref<SearchCoverSchema[]>();
 const panels = ref([0]);
 const emitter = inject<Emitter<Events>>("emitter");
-const type = ref("all");
-emitter?.on("showSearchCoverDialog", (romToSearch) => {
-  rom.value = romToSearch;
-  searchTerm.value = romToSearch.name || romToSearch.file_name_no_tags || "";
+emitter?.on("showSearchCoverDialog", (term) => {
+  searchTerm.value = term;
   show.value = true;
-  searchCovers();
+  if (searchTerm.value) searchCovers();
 });
 
 // Functions
 async function searchCovers() {
-  games.value = undefined;
-
-  if (!rom.value) return;
+  covers.value = [];
 
   // Auto hide android keyboard
   const inputElement = document.getElementById("search-text-field");
@@ -39,21 +33,21 @@ async function searchCovers() {
 
   if (!searching.value) {
     searching.value = true;
-    await romApi
+    await sgdbApi
       .searchCover({
         searchTerm: searchTerm.value,
       })
       .then((response) => {
-        games.value = response.data;
-        filteredGames.value = games.value
+        covers.value = response.data;
+        filteredCovers.value = covers.value
           .map((game) => {
             return {
               ...game,
               resources:
-                type.value === "all"
+                coverType.value === "all"
                   ? game.resources
                   : game.resources.filter(
-                      (resource) => resource.type === type.value
+                      (resource) => resource.type === coverType.value
                     ),
             };
           })
@@ -72,47 +66,22 @@ async function searchCovers() {
   }
 }
 
-async function updateCover(url_cover: string) {
-  if (!rom.value) return;
-
-  show.value = false;
-  emitter?.emit("showLoadingDialog", { loading: true, scrim: true });
-
-  rom.value.url_cover = url_cover.replace("thumb", "grid");
-
-  await romApi
-    .updateRom({ rom: rom.value })
-    .then(({ data }) => {
-      emitter?.emit("snackbarShow", {
-        msg: "Rom updated successfully!",
-        icon: "mdi-check-bold",
-        color: "green",
-      });
-      romsStore.update(data);
-    })
-    .catch((error) => {
-      emitter?.emit("snackbarShow", {
-        msg: error.response.data.detail,
-        icon: "mdi-close-circle",
-        color: "red",
-      });
-    })
-    .finally(() => {
-      emitter?.emit("showLoadingDialog", { loading: false, scrim: false });
-    });
+async function selectCover(url_cover: string) {
+  emitter?.emit("updateUrlCover", url_cover.replace("thumb", "grid"));
+  closeDialog();
 }
 
 function filterCovers() {
-  if (games.value) {
-    filteredGames.value = games.value
+  if (covers.value) {
+    filteredCovers.value = covers.value
       .map((game) => {
         return {
           ...game,
           resources:
-            type.value === "all"
+            coverType.value === "all"
               ? game.resources
               : game.resources.filter(
-                  (resource) => resource.type === type.value
+                  (resource) => resource.type === coverType.value
                 ),
         };
       })
@@ -122,7 +91,9 @@ function filterCovers() {
 
 function closeDialog() {
   show.value = false;
-  games.value = undefined;
+  covers.value = [];
+  filteredCovers.value = [];
+  searchTerm.value = "";
 }
 
 onBeforeUnmount(() => {
@@ -134,9 +105,9 @@ onBeforeUnmount(() => {
   <r-dialog
     @close="closeDialog"
     v-model="show"
-    icon="mdi-image-outline"
+    icon="mdi-image-search-outline"
     :loading-condition="searching"
-    :empty-state-condition="filteredGames?.length == 0"
+    :empty-state-condition="filteredCovers?.length == 0"
     empty-state-type="game"
     scroll-content
     :width="lgAndUp ? '60vw' : '95vw'"
@@ -151,6 +122,7 @@ onBeforeUnmount(() => {
             @click:clear="searchTerm = ''"
             class="bg-terciary"
             v-model="searchTerm"
+            :disabled="searching"
             label="Search"
             hide-details
             clearable
@@ -159,7 +131,7 @@ onBeforeUnmount(() => {
         <v-col cols="2" sm="2">
           <v-select
             :disabled="searching"
-            v-model="type"
+            v-model="coverType"
             hide-details
             label="Type"
             @update:model-value="filterCovers"
@@ -188,7 +160,7 @@ onBeforeUnmount(() => {
         rounded="0"
         variant="accordion"
       >
-        <v-expansion-panel v-for="game in filteredGames" :key="game.name">
+        <v-expansion-panel v-for="game in filteredCovers" :key="game.name">
           <v-expansion-panel-title class="bg-terciary">
             <v-row no-gutters class="justify-center">
               <v-list-item class="pa-0">{{ game.name }}</v-list-item>
@@ -208,13 +180,17 @@ onBeforeUnmount(() => {
                     v-bind="hoverProps"
                     :class="{ 'on-hover': isHovering }"
                     class="transform-scale pointer"
-                    @click="updateCover(resource.url)"
+                    @click="selectCover(resource.url)"
                     :aspect-ratio="2 / 3"
                     :src="resource.thumb"
                     cover
                   >
                     <template #error>
-                      <v-img :src="resource.url" cover :aspect-ratio="2 / 3"></v-img>
+                      <v-img
+                        :src="resource.url"
+                        cover
+                        :aspect-ratio="2 / 3"
+                      ></v-img>
                     </template>
                     <template #placeholder>
                       <div
diff --git a/frontend/src/layouts/Dashboard/Collections.vue b/frontend/src/layouts/Dashboard/Collections.vue
new file mode 100644
index 000000000..eae3beb27
--- /dev/null
+++ b/frontend/src/layouts/Dashboard/Collections.vue
@@ -0,0 +1,35 @@
+<script setup lang="ts">
+import CollectionCard from "@/components/common/Collection/Card.vue";
+import RSection from "@/components/common/RSection.vue";
+import storeCollections from "@/stores/collections";
+import { views } from "@/utils";
+
+// Props
+const collections = storeCollections();
+</script>
+<template>
+  <r-section icon="mdi-bookmark-box-multiple" title="Collections">
+    <template #content>
+      <v-row no-gutters>
+        <v-col
+          v-for="collection in collections.allCollections"
+          :key="collection.name"
+          class="pa-1"
+          :cols="views[0]['size-cols']"
+          :sm="views[0]['size-sm']"
+          :md="views[0]['size-md']"
+          :lg="views[0]['size-lg']"
+          :xl="views[0]['size-xl']"
+        >
+          <collection-card
+            show-rom-count
+            show-title
+            transformScale
+            :key="collection.updated_at"
+            :collection="collection"
+          />
+        </v-col>
+      </v-row>
+    </template>
+  </r-section>
+</template>
diff --git a/frontend/src/layouts/Dashboard/Recent.vue b/frontend/src/layouts/Dashboard/Recent.vue
index f7a924777..d04327d26 100644
--- a/frontend/src/layouts/Dashboard/Recent.vue
+++ b/frontend/src/layouts/Dashboard/Recent.vue
@@ -1,38 +1,27 @@
 <script setup lang="ts">
 import GameCard from "@/components/common/Game/Card/Base.vue";
 import RSection from "@/components/common/RSection.vue";
-import romApi from "@/services/api/rom";
 import storeRoms, { type SimpleRom } from "@/stores/roms";
 import { views } from "@/utils";
-import { onMounted } from "vue";
+import { storeToRefs } from "pinia";
 import { useRouter } from "vue-router";
 
 // Props
 const romsStore = storeRoms();
+const { recentRoms } = storeToRefs(romsStore)
 const router = useRouter();
 
 // Functions
 function onGameClick(emitData: { rom: SimpleRom; event: MouseEvent }) {
   router.push({ name: "rom", params: { rom: emitData.rom.id } });
 }
-
-onMounted(() => {
-  romApi
-    .getRecentRoms()
-    .then(({ data: recentData }) => {
-      romsStore.setRecentRoms(recentData);
-    })
-    .catch((error) => {
-      console.error(error);
-    });
-});
 </script>
 <template>
   <r-section icon="mdi-shimmer" title="Recently added">
     <template #content>
       <v-row class="flex-nowrap overflow-x-auto" no-gutters>
         <v-col
-          v-for="rom in romsStore.recentRoms"
+          v-for="rom in recentRoms"
           :key="rom.id"
           class="px-1 pt-1 pb-2"
           :cols="views[0]['size-cols']"
@@ -42,6 +31,7 @@ onMounted(() => {
           :xl="views[0]['size-xl']"
         >
           <game-card
+            :key="rom.updated_at"
             @click="onGameClick"
             :rom="rom"
             transform-scale
@@ -54,5 +44,4 @@ onMounted(() => {
       <!-- TODO: Add a button to upload roms if no roms were uploaded in the last 30 days -->
     </template>
   </r-section>
-
 </template>
diff --git a/frontend/src/layouts/Dashboard/Summary.vue b/frontend/src/layouts/Dashboard/Stats.vue
similarity index 100%
rename from frontend/src/layouts/Dashboard/Summary.vue
rename to frontend/src/layouts/Dashboard/Stats.vue
diff --git a/frontend/src/plugins/pinia.d.ts b/frontend/src/plugins/pinia.d.ts
new file mode 100644
index 000000000..32a722b64
--- /dev/null
+++ b/frontend/src/plugins/pinia.d.ts
@@ -0,0 +1,8 @@
+import "pinia";
+import { Router } from "vue-router";
+
+declare module "pinia" {
+  export interface PiniaCustomProperties {
+    $router: Router;
+  }
+}
diff --git a/frontend/src/plugins/pinia.ts b/frontend/src/plugins/pinia.ts
index b0b380854..4b3a8a582 100644
--- a/frontend/src/plugins/pinia.ts
+++ b/frontend/src/plugins/pinia.ts
@@ -1,5 +1,9 @@
 import { createPinia } from "pinia";
+import { markRaw } from "vue";
+import router from "@/plugins/router";
 
 const pinia = createPinia();
-
+pinia.use(({ store }) => {
+  store.$router = markRaw(router);
+});
 export default pinia;
diff --git a/frontend/src/plugins/router.ts b/frontend/src/plugins/router.ts
index 62a7269fd..b897e284f 100644
--- a/frontend/src/plugins/router.ts
+++ b/frontend/src/plugins/router.ts
@@ -20,7 +20,12 @@ const routes = [
       {
         path: "/platform/:platform",
         name: "platform",
-        component: () => import("@/views/Gallery.vue"),
+        component: () => import("@/views/Gallery/Platform.vue"),
+      },
+      {
+        path: "/collection/:collection",
+        name: "collection",
+        component: () => import("@/views/Gallery/Collection.vue"),
       },
       {
         path: "/rom/:rom",
@@ -69,6 +74,7 @@ const router = createRouter({
 router.afterEach(() => {
   // Scroll to top to avoid annoying behaviour in mobile
   window.scrollTo({ top: 0, left: 0 });
+  // TODO: check permission for views. Ex: view user can access to /scan view
 });
 
 export default router;
diff --git a/frontend/src/services/api/collection.ts b/frontend/src/services/api/collection.ts
new file mode 100644
index 000000000..1ee57285f
--- /dev/null
+++ b/frontend/src/services/api/collection.ts
@@ -0,0 +1,68 @@
+import type { MessageResponse } from "@/__generated__";
+import api from "@/services/api/index";
+import type { Collection } from "@/stores/collections";
+
+export type UpdatedCollection = Collection & {
+  artwork?: File;
+  url_cover?: string;
+};
+
+export const collectionApi = api;
+
+async function createCollection({
+  collection,
+}: {
+  collection: UpdatedCollection;
+}): Promise<{ data: Collection }> {
+  const formData = new FormData();
+  formData.append("name", collection.name || "");
+  formData.append("description", collection.description || "");
+  formData.append("url_cover", collection.url_cover || "");
+  formData.append("roms", JSON.stringify(collection.roms));
+  if (collection.artwork) formData.append("artwork", collection.artwork);
+  return api.post(`/collections`, formData);
+}
+
+async function getCollections(): Promise<{ data: Collection[] }> {
+  return api.get("/collections");
+}
+
+async function getCollection(
+  id: number | undefined,
+): Promise<{ data: Collection }> {
+  return api.get(`/collections/${id}`);
+}
+
+async function updateCollection({
+  collection,
+  removeCover = false,
+}: {
+  collection: UpdatedCollection;
+  removeCover?: boolean;
+}): Promise<{ data: Collection }> {
+  const formData = new FormData();
+  formData.append("name", collection.name || "");
+  formData.append("description", collection.description || "");
+  formData.append("url_cover", collection.url_cover || "");
+  formData.append("roms", JSON.stringify(collection.roms));
+  if (collection.artwork) formData.append("artwork", collection.artwork);
+  return api.put(`/collections/${collection.id}`, formData, {
+    params: { remove_cover: removeCover },
+  });
+}
+
+async function deleteCollection({
+  collection,
+}: {
+  collection: Collection;
+}): Promise<{ data: MessageResponse }> {
+  return api.delete(`/collections/${collection.id}`);
+}
+
+export default {
+  createCollection,
+  getCollections,
+  getCollection,
+  updateCollection,
+  deleteCollection,
+};
diff --git a/frontend/src/services/api/rom.ts b/frontend/src/services/api/rom.ts
index 1bc6aedbd..fa6383ee4 100644
--- a/frontend/src/services/api/rom.ts
+++ b/frontend/src/services/api/rom.ts
@@ -1,13 +1,12 @@
 import type {
   AddRomsResponse,
   MessageResponse,
-  SearchCoverSchema,
   SearchRomSchema,
 } from "@/__generated__";
 import api from "@/services/api/index";
 import socket from "@/services/socket";
 import storeDownload from "@/stores/download";
-import type { SimpleRom, DetailedRom } from "@/stores/roms";
+import type { DetailedRom, SimpleRom } from "@/stores/roms";
 import { getDownloadLink } from "@/utils";
 
 export const romApi = api;
@@ -32,11 +31,13 @@ async function uploadRoms({
 
 async function getRoms({
   platformId = null,
+  collectionId = null,
   searchTerm = "",
   orderBy = "name",
   orderDir = "asc",
 }: {
   platformId?: number | null;
+  collectionId?: number | null;
   searchTerm?: string | null;
   orderBy?: string | null;
   orderDir?: string | null;
@@ -44,6 +45,7 @@ async function getRoms({
   return api.get(`/roms`, {
     params: {
       platform_id: platformId,
+      collection_id: collectionId,
       search_term: searchTerm,
       order_by: orderBy,
       order_dir: orderDir,
@@ -91,14 +93,6 @@ async function searchRom({
   });
 }
 
-async function searchCover({
-  searchTerm,
-}: {
-  searchTerm: string;
-}): Promise<{ data: SearchCoverSchema[] }> {
-  return api.get("/search/cover", { params: { search_term: searchTerm } });
-}
-
 // Listen for multi-file download completion events
 socket.on("download:complete", clearRomFromDownloads);
 
@@ -191,7 +185,6 @@ export default {
   getRom,
   downloadRom,
   searchRom,
-  searchCover,
   updateRom,
   deleteRoms,
   updateUserRomProps,
diff --git a/frontend/src/services/api/sgdb.ts b/frontend/src/services/api/sgdb.ts
new file mode 100644
index 000000000..dc1eca314
--- /dev/null
+++ b/frontend/src/services/api/sgdb.ts
@@ -0,0 +1,16 @@
+import type { SearchCoverSchema } from "@/__generated__";
+import api from "@/services/api/index";
+
+export const romApi = api;
+
+async function searchCover({
+  searchTerm,
+}: {
+  searchTerm: string;
+}): Promise<{ data: SearchCoverSchema[] }> {
+  return api.get("/search/cover", { params: { search_term: searchTerm } });
+}
+
+export default {
+  searchCover,
+};
diff --git a/frontend/src/stores/collections.ts b/frontend/src/stores/collections.ts
new file mode 100644
index 000000000..0044b39b7
--- /dev/null
+++ b/frontend/src/stores/collections.ts
@@ -0,0 +1,54 @@
+import { defineStore } from "pinia";
+import type { CollectionSchema } from "@/__generated__";
+import { uniqBy } from "lodash";
+
+export type Collection = CollectionSchema;
+
+export default defineStore("collections", {
+  state: () => {
+    return {
+      allCollections: [] as Collection[],
+      searchText: "" as string,
+    };
+  },
+  getters: {
+    filteredCollections: ({ allCollections, searchText }) =>
+      allCollections.filter((p) =>
+        p.name.toLowerCase().includes(searchText.toLowerCase()),
+      ),
+  },
+  actions: {
+    _reorder() {
+      this.allCollections = this.allCollections.sort((a, b) => {
+        return a.name.localeCompare(b.name);
+      });
+      this.allCollections = uniqBy(this.allCollections, "id");
+    },
+    set(collections: Collection[]) {
+      this.allCollections = collections;
+    },
+    add(collection: Collection) {
+      this.allCollections.push(collection);
+      this._reorder();
+    },
+    update(collection: Collection) {
+      this.allCollections = this.allCollections.map((value) =>
+        value.id === collection.id ? collection : value,
+      );
+      this._reorder();
+    },
+    exists(collection: Collection) {
+      return (
+        this.allCollections.filter((p) => p.name == collection.name).length > 0
+      );
+    },
+    remove(collection: Collection) {
+      this.allCollections = this.allCollections.filter((p) => {
+        return p.name !== collection.name;
+      });
+    },
+    get(collectionId: number) {
+      return this.allCollections.find((p) => p.id === collectionId);
+    },
+  },
+});
diff --git a/frontend/src/stores/navigation.ts b/frontend/src/stores/navigation.ts
index 61c710c86..d2a4225f4 100644
--- a/frontend/src/stores/navigation.ts
+++ b/frontend/src/stores/navigation.ts
@@ -3,18 +3,37 @@ import { defineStore } from "pinia";
 export default defineStore("navigation", {
   state: () => ({
     activePlatformsDrawer: false,
+    activeCollectionsDrawer: false,
     activeSettingsDrawer: false,
   }),
 
   actions: {
     switchActivePlatformsDrawer() {
+      this.activeCollectionsDrawer = false;
+      this.activeSettingsDrawer = false;
       this.activePlatformsDrawer = !this.activePlatformsDrawer;
     },
+    switchActiveCollectionsDrawer() {
+      this.activePlatformsDrawer = false;
+      this.activeSettingsDrawer = false;
+      this.activeCollectionsDrawer = !this.activeCollectionsDrawer;
+    },
     switchActiveSettingsDrawer() {
+      this.activePlatformsDrawer = false;
+      this.activeCollectionsDrawer = false;
       this.activeSettingsDrawer = !this.activeSettingsDrawer;
     },
+    goHome() {
+      this.resetDrawers();
+      this.$router.push({ name: "dashboard" });
+    },
+    goScan() {
+      this.resetDrawers();
+      this.$router.push({ name: "scan" });
+    },
     resetDrawers() {
       this.activePlatformsDrawer = false;
+      this.activeCollectionsDrawer = false;
       this.activeSettingsDrawer = false;
     },
   },
diff --git a/frontend/src/stores/platforms.ts b/frontend/src/stores/platforms.ts
index ef12e23ff..6df4aac3e 100644
--- a/frontend/src/stores/platforms.ts
+++ b/frontend/src/stores/platforms.ts
@@ -7,38 +7,45 @@ export type Platform = PlatformSchema;
 export default defineStore("platforms", {
   state: () => {
     return {
-      value: [] as Platform[],
+      all: [] as Platform[],
+      searchText: "" as string,
     };
   },
   getters: {
-    totalGames: ({ value }) =>
+    totalGames: ({ all: value }) =>
       value.reduce((count, p) => count + p.rom_count, 0),
-    filledPlatforms: ({ value }) => value.filter((p) => p.rom_count > 0),
+    filledPlatforms: ({ all }) => all.filter((p) => p.rom_count > 0),
+    filteredPlatforms: ({ all, searchText }) =>
+      all.filter(
+        (p) =>
+          p.rom_count > 0 &&
+          p.name.toLowerCase().includes(searchText.toLowerCase()),
+      ),
   },
   actions: {
     _reorder() {
-      this.value = this.value.sort((a, b) => {
+      this.all = this.all.sort((a, b) => {
         return a.name.localeCompare(b.name);
       });
-      this.value = uniqBy(this.value, "id");
+      this.all = uniqBy(this.all, "id");
     },
     set(platforms: Platform[]) {
-      this.value = platforms;
+      this.all = platforms;
     },
     add(platform: Platform) {
-      this.value.push(platform);
+      this.all.push(platform);
       this._reorder();
     },
     exists(platform: Platform) {
-      return this.value.filter((p) => p.fs_slug == platform.fs_slug).length > 0;
+      return this.all.filter((p) => p.fs_slug == platform.fs_slug).length > 0;
     },
     remove(platform: Platform) {
-      this.value = this.value.filter((p) => {
+      this.all = this.all.filter((p) => {
         return p.slug !== platform.slug;
       });
     },
     get(platformId: number) {
-      return this.value.find((p) => p.id === platformId);
+      return this.all.find((p) => p.id === platformId);
     },
   },
 });
diff --git a/frontend/src/stores/roms.ts b/frontend/src/stores/roms.ts
index 4906f62b5..e5f0b39ad 100644
--- a/frontend/src/stores/roms.ts
+++ b/frontend/src/stores/roms.ts
@@ -1,6 +1,7 @@
 import type { SearchRomSchema } from "@/__generated__";
 import type { DetailedRomSchema, RomSchema } from "@/__generated__/";
 import { type Platform } from "@/stores/platforms";
+import { type Collection } from "@/stores/collections";
 import type { ExtractPiniaStoreType } from "@/types";
 import { groupBy, uniqBy } from "lodash";
 import { nanoid } from "nanoid";
@@ -18,6 +19,8 @@ export type DetailedRom = DetailedRomSchema;
 export default defineStore("roms", {
   state: () => ({
     currentPlatform: null as Platform | null,
+    currentCollection: null as Collection | null,
+    currentRom: null as DetailedRom | null,
     allRoms: [] as SimpleRom[],
     _grouped: [] as SimpleRom[],
     _filteredIDs: [] as number[],
@@ -89,9 +92,15 @@ export default defineStore("roms", {
     setCurrentPlatform(platform: Platform) {
       this.currentPlatform = platform;
     },
+    setCurrentRom(rom: DetailedRom) {
+      this.currentRom = rom;
+    },
     setRecentRoms(roms: SimpleRom[]) {
       this.recentRoms = roms;
     },
+    setCurrentCollection(collection: Collection) {
+      this.currentCollection = collection;
+    },
     set(roms: SimpleRom[]) {
       this.allRoms = roms;
       this._reorder();
@@ -104,6 +113,9 @@ export default defineStore("roms", {
       this.allRoms = this.allRoms.map((value) =>
         value.id === rom.id ? rom : value,
       );
+      this.recentRoms = this.recentRoms.map((value) =>
+        value.id === rom.id ? rom : value,
+      );
       this._reorder();
     },
     remove(roms: SimpleRom[]) {
diff --git a/frontend/src/stores/users.ts b/frontend/src/stores/users.ts
index e21793388..a5448b080 100644
--- a/frontend/src/stores/users.ts
+++ b/frontend/src/stores/users.ts
@@ -5,22 +5,22 @@ export type User = UserSchema;
 
 export default defineStore("users", {
   state: () => ({
-    all: [] as User[],
+    allUsers: [] as User[],
   }),
 
   getters: {
-    admins: (state) => state.all.filter((user) => user.role === "admin"),
+    admins: (state) => state.allUsers.filter((user) => user.role === "admin"),
   },
 
   actions: {
     set(users: User[]) {
-      this.all = users;
+      this.allUsers = users;
     },
     add(user: User) {
-      this.all = this.all.concat(user);
+      this.allUsers = this.allUsers.concat(user);
     },
     update(user: User) {
-      this.all = this.all.map((value) => {
+      this.allUsers = this.allUsers.map((value) => {
         if (value.id === user.id) {
           return user;
         }
@@ -28,12 +28,12 @@ export default defineStore("users", {
       });
     },
     remove(userId: number) {
-      this.all = this.all.filter((value) => {
+      this.allUsers = this.allUsers.filter((value) => {
         return value.id !== userId;
       });
     },
     reset() {
-      this.all = [];
+      this.allUsers = [];
     },
   },
 });
diff --git a/frontend/src/types/emitter.d.ts b/frontend/src/types/emitter.d.ts
index f89124ffc..60e4322e9 100644
--- a/frontend/src/types/emitter.d.ts
+++ b/frontend/src/types/emitter.d.ts
@@ -1,4 +1,5 @@
 import type { SaveSchema, StateSchema } from "@/__generated__";
+import type { Collection } from "@/stores/collections";
 import type { Platform } from "@/stores/platforms";
 import type { SimpleRom } from "@/stores/roms";
 import type { User } from "@/stores/users";
@@ -18,8 +19,14 @@ export type SnackbarStatus = {
 
 export type Events = {
   showDeletePlatformDialog: Platform;
+  showCreateCollectionDialog: null;
+  showEditCollectionDialog: Collection;
+  showAddToCollectionDialog: SimpleRom[];
+  showRemoveFromCollectionDialog: SimpleRom[];
+  showDeleteCollectionDialog: Collection;
   showMatchRomDialog: SimpleRom;
-  showSearchCoverDialog: SimpleRom;
+  showSearchCoverDialog: string;
+  updateUrlCover: string;
   showSearchRomDialog: null;
   showEditRomDialog: SimpleRom;
   showCopyDownloadLinkDialog: string;
diff --git a/frontend/src/views/Dashboard.vue b/frontend/src/views/Dashboard.vue
index bfb9f46f7..ad0814bac 100644
--- a/frontend/src/views/Dashboard.vue
+++ b/frontend/src/views/Dashboard.vue
@@ -1,11 +1,39 @@
 <script setup lang="ts">
-import dashboardPlatforms from "@/layouts/Dashboard/Platforms.vue";
+import Collections from "@/layouts/Dashboard/Collections.vue";
+import Platforms from "@/layouts/Dashboard/Platforms.vue";
 import recentlyAdded from "@/layouts/Dashboard/Recent.vue";
-import dashboardSummary from "@/layouts/Dashboard/Summary.vue";
+import Stats from "@/layouts/Dashboard/Stats.vue";
+import romApi from "@/services/api/rom";
+import storeCollections from "@/stores/collections";
+import storePlatforms from "@/stores/platforms";
+import storeRoms from "@/stores/roms";
+import { storeToRefs } from "pinia";
+import { onMounted } from "vue";
+
+// Props
+const romsStore = storeRoms();
+const { recentRoms } = storeToRefs(romsStore);
+const platforms = storePlatforms();
+const { filledPlatforms } = storeToRefs(platforms);
+const collections = storeCollections();
+const { allCollections } = storeToRefs(collections);
+
+// Functions
+onMounted(async () => {
+  await romApi
+    .getRecentRoms()
+    .then(({ data: recentData }) => {
+      romsStore.setRecentRoms(recentData);
+    })
+    .catch((error) => {
+      console.error(error);
+    });
+});
 </script>
 
 <template>
-  <dashboard-summary />
-  <recently-added />
-  <dashboard-platforms />
+  <stats />
+  <recently-added v-if="recentRoms.length > 0" />
+  <platforms v-if="filledPlatforms.length > 0" />
+  <collections v-if="allCollections.length > 0" />
 </template>
diff --git a/frontend/src/views/Gallery/Collection.vue b/frontend/src/views/Gallery/Collection.vue
new file mode 100644
index 000000000..f817e4292
--- /dev/null
+++ b/frontend/src/views/Gallery/Collection.vue
@@ -0,0 +1,313 @@
+<script setup lang="ts">
+import GalleryAppBarCollection from "@/components/Gallery/AppBar/Collection/Base.vue";
+import FabOverlay from "@/components/Gallery/FabOverlay.vue";
+import EmptyGame from "@/components/common/EmptyGame.vue";
+import EmptyCollection from "@/components/common/EmptyCollection.vue";
+import GameCard from "@/components/common/Game/Card/Base.vue";
+import GameCardFlags from "@/components/common/Game/Card/Flags.vue";
+import GameDataTable from "@/components/common/Game/Table.vue";
+import collectionApi from "@/services/api/collection";
+import romApi from "@/services/api/rom";
+import storeGalleryFilter from "@/stores/galleryFilter";
+import storeGalleryView from "@/stores/galleryView";
+import storeCollections from "@/stores/collections";
+import storeRoms, { type SimpleRom } from "@/stores/roms";
+import type { Events } from "@/types/emitter";
+import { normalizeString, views } from "@/utils";
+import type { Emitter } from "mitt";
+import { storeToRefs } from "pinia";
+import { inject, onBeforeUnmount, onMounted, ref } from "vue";
+import { onBeforeRouteUpdate, useRoute, useRouter } from "vue-router";
+import { useDisplay } from "vuetify";
+
+// Props
+const { smAndDown } = useDisplay();
+const route = useRoute();
+const galleryViewStore = storeGalleryView();
+const galleryFilterStore = storeGalleryFilter();
+const { scrolledToTop, currentView } = storeToRefs(galleryViewStore);
+const collectionsStore = storeCollections();
+const romsStore = storeRoms();
+const {
+  allRoms,
+  filteredRoms,
+  selectedRoms,
+  currentCollection,
+  itemsPerBatch,
+  gettingRoms,
+} = storeToRefs(romsStore);
+const itemsShown = ref(itemsPerBatch.value);
+const noCollectionError = ref(false);
+const router = useRouter();
+let timeout: ReturnType<typeof setTimeout>;
+const emitter = inject<Emitter<Events>>("emitter");
+emitter?.on("filter", onFilterChange);
+
+// Functions
+async function fetchRoms() {
+  if (gettingRoms.value) return;
+
+  gettingRoms.value = true;
+  emitter?.emit("showLoadingDialog", {
+    loading: gettingRoms.value,
+    scrim: false,
+  });
+
+  await romApi
+    .getRoms({
+      collectionId: romsStore.currentCollection?.id,
+      searchTerm: normalizeString(galleryFilterStore.filterSearch),
+    })
+    .then(({ data }) => {
+      romsStore.set(data);
+      romsStore.setFiltered(data, galleryFilterStore);
+    })
+    .catch((error) => {
+      emitter?.emit("snackbarShow", {
+        msg: `Couldn't fetch roms for collection ID ${currentCollection.value?.id}: ${error}`,
+        icon: "mdi-close-circle",
+        color: "red",
+        timeout: 4000,
+      });
+      console.error(
+        `Couldn't fetch roms for collection ID ${currentCollection.value?.id}: ${error}`
+      );
+      noCollectionError.value = true;
+    })
+    .finally(() => {
+      gettingRoms.value = false;
+      emitter?.emit("showLoadingDialog", {
+        loading: gettingRoms.value,
+        scrim: false,
+      });
+    });
+}
+
+function setFilters() {
+  galleryFilterStore.setFilterGenre([
+    ...new Set(
+      romsStore.filteredRoms
+        .flatMap((rom) => rom.genres.map((genre) => genre))
+        .sort()
+    ),
+  ]);
+  galleryFilterStore.setFilterFranchise([
+    ...new Set(
+      romsStore.filteredRoms
+        .flatMap((rom) => rom.franchises.map((franchise) => franchise))
+        .sort()
+    ),
+  ]);
+  galleryFilterStore.setFilterCompany([
+    ...new Set(
+      romsStore.filteredRoms
+        .flatMap((rom) => rom.companies.map((company) => company))
+        .sort()
+    ),
+  ]);
+  galleryFilterStore.setFilterCollection([
+    ...new Set(
+      romsStore.filteredRoms
+        .flatMap((rom) => rom.collections.map((collection) => collection))
+        .sort()
+    ),
+  ]);
+}
+
+async function onFilterChange() {
+  romsStore.setFiltered(allRoms.value, galleryFilterStore);
+  emitter?.emit("updateDataTablePages", null);
+}
+
+function onGameClick(emitData: { rom: SimpleRom; event: MouseEvent }) {
+  let index = filteredRoms.value.indexOf(emitData.rom);
+  if (
+    emitData.event.ctrlKey ||
+    emitData.event.shiftKey ||
+    romsStore.selecting ||
+    romsStore.selectedRoms.length > 0
+  ) {
+    emitData.event.preventDefault();
+    emitData.event.stopPropagation();
+    if (!selectedRoms.value.includes(emitData.rom)) {
+      romsStore.addToSelection(emitData.rom);
+    } else {
+      romsStore.removeFromSelection(emitData.rom);
+    }
+    if (emitData.event.shiftKey) {
+      const [start, end] = [romsStore.lastSelectedIndex, index].sort(
+        (a, b) => a - b
+      );
+      if (romsStore.selectedRoms.includes(emitData.rom)) {
+        for (let i = start + 1; i < end; i++) {
+          romsStore.addToSelection(filteredRoms.value[i]);
+        }
+      } else {
+        for (let i = start; i <= end; i++) {
+          romsStore.removeFromSelection(filteredRoms.value[i]);
+        }
+      }
+      romsStore.updateLastSelected(
+        romsStore.selectedRoms.includes(emitData.rom) ? index : index - 1
+      );
+    } else {
+      romsStore.updateLastSelected(index);
+    }
+  } else {
+    router.push({ name: "rom", params: { rom: emitData.rom.id } });
+  }
+}
+
+function onGameTouchStart(emitData: { rom: SimpleRom; event: TouchEvent }) {
+  timeout = setTimeout(() => {
+    romsStore.addToSelection(emitData.rom);
+  }, 500);
+}
+
+function onGameTouchEnd() {
+  clearTimeout(timeout);
+}
+
+function onScroll() {
+  if (galleryViewStore.currentView != 2) {
+    window.setTimeout(async () => {
+      const { scrollTop, scrollHeight, clientHeight } =
+        document.documentElement;
+      scrolledToTop.value = scrollTop === 0;
+      const totalScrollableHeight = scrollHeight - clientHeight;
+      const ninetyPercentPoint = totalScrollableHeight * 0.9;
+      if (
+        scrollTop >= ninetyPercentPoint &&
+        itemsShown.value < filteredRoms.value.length
+      ) {
+        itemsShown.value = itemsShown.value + itemsPerBatch.value;
+        setFilters();
+        galleryViewStore.scroll = scrollHeight;
+      }
+    }, 100);
+    clearTimeout(timeout);
+  }
+}
+
+function resetGallery() {
+  romsStore.reset();
+  galleryFilterStore.reset();
+  scrolledToTop.value = true;
+  noCollectionError.value = false;
+  itemsShown.value = itemsPerBatch.value;
+}
+
+onMounted(async () => {
+  const routeCollectionId = Number(route.params.collection);
+  const routeCollection = collectionsStore.get(routeCollectionId);
+
+  if (!routeCollection) {
+    await collectionApi
+      .getCollection(routeCollectionId)
+      .then((data) => {
+        collectionsStore.add(data.data);
+        romsStore.setCurrentCollection(data.data);
+      })
+      .catch((error) => {
+        console.log(error);
+        noCollectionError.value = true;
+      });
+  } else {
+    romsStore.setCurrentCollection(routeCollection);
+  }
+  if (!noCollectionError.value) {
+    resetGallery();
+    await fetchRoms();
+    setFilters();
+    window.addEventListener("wheel", onScroll);
+    window.addEventListener("scroll", onScroll);
+  }
+});
+
+onBeforeRouteUpdate(async (to, from) => {
+  // Triggers when change param of the same route
+  // Reset store if switching to another collection
+  if (to.path === from.path) return;
+
+  resetGallery();
+
+  const routeCollectionId = Number(to.params.collection);
+  const routeCollection = collectionsStore.get(routeCollectionId);
+  if (!routeCollection) {
+    const { data } = await collectionApi.getCollection(routeCollectionId);
+    collectionsStore.add(data);
+  } else {
+    romsStore.setCurrentCollection(routeCollection);
+  }
+
+  await fetchRoms();
+  setFilters();
+});
+
+onBeforeUnmount(() => {
+  window.removeEventListener("wheel", onScroll);
+  window.removeEventListener("scroll", onScroll);
+});
+</script>
+
+<template>
+  <template v-if="!noCollectionError">
+    <gallery-app-bar-collection />
+    <template v-if="filteredRoms.length > 0">
+      <v-row
+        no-gutters
+        class="overflow-hidden"
+        :class="{ 'pa-1': currentView != 2 }"
+      >
+        <!-- Gallery cards view -->
+        <!-- v-show instead of v-if to avoid recalculate on view change -->
+        <v-col
+          v-for="rom in filteredRoms.slice(0, itemsShown)"
+          v-show="currentView != 2"
+          :key="rom.id"
+          class="pa-1"
+          :cols="views[currentView]['size-cols']"
+          :sm="views[currentView]['size-sm']"
+          :md="views[currentView]['size-md']"
+          :lg="views[currentView]['size-lg']"
+          :xl="views[currentView]['size-xl']"
+        >
+          <game-card
+            :key="rom.updated_at"
+            :rom="rom"
+            title-on-hover
+            show-action-bar
+            transform-scale
+            with-border
+            :with-border-romm-accent="
+              romsStore.isSimpleRom(rom) && selectedRoms?.includes(rom)
+            "
+            @click="onGameClick"
+            @touchstart="onGameTouchStart"
+            @touchend="onGameTouchEnd"
+          >
+            <template #prepend-inner>
+              <game-card-flags :rom="rom" />
+            </template>
+          </game-card>
+        </v-col>
+
+        <!-- Gallery list view -->
+        <v-col v-show="currentView == 2">
+          <game-data-table
+            :class="{
+              'fill-height-desktop': !smAndDown,
+              'fill-height-mobile': smAndDown,
+            }"
+          />
+        </v-col>
+      </v-row>
+      <fab-overlay />
+    </template>
+    <template v-else>
+      <empty-game v-if="!gettingRoms && galleryFilterStore.isFiltered()" />
+    </template>
+  </template>
+
+  <empty-collection v-else />
+</template>
diff --git a/frontend/src/views/Gallery.vue b/frontend/src/views/Gallery/Platform.vue
similarity index 98%
rename from frontend/src/views/Gallery.vue
rename to frontend/src/views/Gallery/Platform.vue
index 4977a83d8..2351e9801 100644
--- a/frontend/src/views/Gallery.vue
+++ b/frontend/src/views/Gallery/Platform.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import GalleryAppBar from "@/components/Gallery/AppBar/Base.vue";
+import GalleryAppBar from "@/components/Gallery/AppBar/Platform/Base.vue";
 import FabOverlay from "@/components/Gallery/FabOverlay.vue";
 import EmptyGame from "@/components/common/EmptyGame.vue";
 import EmptyPlatform from "@/components/common/EmptyPlatform.vue";
@@ -274,6 +274,7 @@ onBeforeUnmount(() => {
           :xl="views[currentView]['size-xl']"
         >
           <game-card
+            :key="rom.updated_at"
             :rom="rom"
             title-on-hover
             show-action-bar
diff --git a/frontend/src/views/GameDetails.vue b/frontend/src/views/GameDetails.vue
index ec88d765d..cd25045ac 100644
--- a/frontend/src/views/GameDetails.vue
+++ b/frontend/src/views/GameDetails.vue
@@ -1,6 +1,4 @@
 <script setup lang="ts">
-import EmptyGame from "@/components/common/EmptyGame.vue";
-import Cover from "@/components/common/Game/Card/Base.vue";
 import ActionBar from "@/components/Details/ActionBar.vue";
 import AdditionalContent from "@/components/Details/AdditionalContent.vue";
 import BackgroundHeader from "@/components/Details/BackgroundHeader.vue";
@@ -11,20 +9,22 @@ import RelatedGames from "@/components/Details/RelatedGames.vue";
 import Saves from "@/components/Details/Saves.vue";
 import States from "@/components/Details/States.vue";
 import TitleInfo from "@/components/Details/Title.vue";
+import EmptyGame from "@/components/common/EmptyGame.vue";
+import Cover from "@/components/common/Game/Card/Base.vue";
 import platformApi from "@/services/api/platform";
 import romApi from "@/services/api/rom";
 import storeDownload from "@/stores/download";
 import type { Platform } from "@/stores/platforms";
-import type { DetailedRom } from "@/stores/roms";
+import storeRoms from "@/stores/roms";
 import type { Events } from "@/types/emitter";
 import type { Emitter } from "mitt";
+import { storeToRefs } from "pinia";
 import { inject, onBeforeMount, ref, watch } from "vue";
-import { useRoute } from "vue-router";
+import { onBeforeRouteLeave, useRoute } from "vue-router";
 import { useDisplay } from "vuetify";
 
 // Props
 const route = useRoute();
-const rom = ref<DetailedRom>();
 const platform = ref<Platform>();
 const tab = ref<
   | "details"
@@ -38,13 +38,15 @@ const tab = ref<
 const { smAndDown, mdAndDown, mdAndUp, lgAndUp } = useDisplay();
 const emitter = inject<Emitter<Events>>("emitter");
 const noRomError = ref(false);
+const romsStore = storeRoms();
+const { currentRom } = storeToRefs(romsStore);
 
 // Functions
 async function fetchDetails() {
   await romApi
     .getRom({ romId: parseInt(route.params.rom as string) })
-    .then((response) => {
-      rom.value = response.data;
+    .then(({ data }) => {
+      currentRom.value = data;
     })
     .catch((error) => {
       console.log(error);
@@ -56,7 +58,7 @@ async function fetchDetails() {
 
   if (!noRomError.value) {
     await platformApi
-      .getPlatform(rom.value?.platform_id)
+      .getPlatform(currentRom.value?.platform_id)
       .then((response) => {
         platform.value = response.data;
       })
@@ -71,7 +73,7 @@ async function fetchDetails() {
 
 onBeforeMount(async () => {
   emitter?.emit("showLoadingDialog", { loading: true, scrim: false });
-  if (rom.value) {
+  if (currentRom.value?.id == parseInt(route.params.rom as string)) {
     emitter?.emit("showLoadingDialog", { loading: false, scrim: false });
   } else {
     await fetchDetails();
@@ -80,6 +82,10 @@ onBeforeMount(async () => {
   downloadStore.clear();
 });
 
+onBeforeRouteLeave(() => {
+  currentRom.value = null;
+});
+
 watch(
   () => route.fullPath,
   async () => {
@@ -89,8 +95,9 @@ watch(
 </script>
 
 <template>
-  <template v-if="rom && platform">
-    <background-header :rom="rom" />
+  <!-- TODO: review layout on certain roms - ej: mortal kombat 2 for gb  -->
+  <template v-if="currentRom && platform">
+    <background-header />
 
     <v-row
       class="px-5"
@@ -107,9 +114,13 @@ watch(
           'cover-mobile': smAndDown,
         }"
       >
-        <cover :rom="rom" />
-        <action-bar class="mt-2" :rom="rom" />
-        <related-games v-if="mdAndUp" class="mt-3" :rom="rom" />
+        <cover
+          :key="currentRom.updated_at"
+          :pointerOnHover="false"
+          :rom="currentRom"
+        />
+        <action-bar class="mt-2" :rom="currentRom" />
+        <related-games v-if="mdAndUp" class="mt-3" :rom="currentRom" />
       </v-col>
 
       <v-col
@@ -128,7 +139,7 @@ watch(
             'justify-center': smAndDown,
           }"
         >
-          <title-info :rom="rom" :platform="platform" />
+          <title-info :rom="currentRom" :platform="platform" />
         </div>
         <v-row
           :class="{
@@ -144,8 +155,8 @@ watch(
             <v-tab
               v-if="
                 mdAndDown &&
-                ((rom.igdb_metadata?.expansions ?? []).length > 0 ||
-                  (rom.igdb_metadata?.dlcs ?? []).length > 0)
+                ((currentRom.igdb_metadata?.expansions ?? []).length > 0 ||
+                  (currentRom.igdb_metadata?.dlcs ?? []).length > 0)
               "
               value="additionalcontent"
               rounded="0"
@@ -157,9 +168,9 @@ watch(
             <v-tab
               v-if="
                 smAndDown &&
-                ((rom.igdb_metadata?.remakes ?? []).length > 0 ||
-                  (rom.igdb_metadata?.remasters ?? []).length > 0 ||
-                  (rom.igdb_metadata?.expanded_games ?? []).length > 0)
+                ((currentRom.igdb_metadata?.remakes ?? []).length > 0 ||
+                  (currentRom.igdb_metadata?.remasters ?? []).length > 0 ||
+                  (currentRom.igdb_metadata?.expanded_games ?? []).length > 0)
               "
               value="relatedgames"
               rounded="0"
@@ -173,27 +184,30 @@ watch(
             <v-window disabled v-model="tab" class="py-2">
               <v-window-item value="details">
                 <v-row no-gutters :class="{ 'mx-2': mdAndUp }">
-                  <file-info :rom="rom" :platform="platform" />
-                  <game-info :rom="rom" />
+                  <v-col>
+                    <file-info :rom="currentRom" :platform="platform" />
+                    <game-info :rom="currentRom" />
+                  </v-col>
                 </v-row>
               </v-window-item>
               <v-window-item value="saves">
-                <saves :rom="rom" />
+                <saves :rom="currentRom" />
               </v-window-item>
               <v-window-item value="states">
-                <states :rom="rom" />
+                <states :rom="currentRom" />
               </v-window-item>
               <v-window-item value="notes">
-                <notes :rom="rom" />
+                <notes :rom="currentRom" />
               </v-window-item>
               <v-window-item
                 v-if="
                   mdAndDown &&
-                  (rom.igdb_metadata?.expansions || rom.igdb_metadata?.dlcs)
+                  (currentRom.igdb_metadata?.expansions ||
+                    currentRom.igdb_metadata?.dlcs)
                 "
                 value="additionalcontent"
               >
-                <additional-content :rom="rom" />
+                <additional-content :rom="currentRom" />
               </v-window-item>
               <!-- TODO: user screenshots -->
               <!-- <v-window-item v-if="rom.user_screenshots.lenght > 0" value="screenshots">
@@ -202,13 +216,13 @@ watch(
               <v-window-item
                 v-if="
                   smAndDown &&
-                  (rom.igdb_metadata?.remakes ||
-                    rom.igdb_metadata?.remasters ||
-                    rom.igdb_metadata?.expanded_games)
+                  (currentRom.igdb_metadata?.remakes ||
+                    currentRom.igdb_metadata?.remasters ||
+                    currentRom.igdb_metadata?.expanded_games)
                 "
                 value="relatedgames"
               >
-                <related-games :rom="rom" />
+                <related-games :rom="currentRom" />
               </v-window-item>
             </v-window>
           </v-col>
@@ -217,7 +231,7 @@ watch(
 
       <template v-if="lgAndUp">
         <v-col>
-          <additional-content :rom="rom" />
+          <additional-content :rom="currentRom" />
         </v-col>
       </template>
     </v-row>
diff --git a/frontend/src/views/Home.vue b/frontend/src/views/Home.vue
index 42f2d7e66..6907add50 100644
--- a/frontend/src/views/Home.vue
+++ b/frontend/src/views/Home.vue
@@ -7,43 +7,41 @@ import CreatePlatformBindingDialog from "@/components/Management/Dialog/CreatePl
 import CreatePlatformVersionDialog from "@/components/Management/Dialog/CreatePlatformVersion.vue";
 import DeletePlatformBindingDialog from "@/components/Management/Dialog/DeletePlatformBinding.vue";
 import DeletePlatformVersionDialog from "@/components/Management/Dialog/DeletePlatformVersion.vue";
+import AddRomsToCollectionDialog from "@/components/common/Collection/Dialog/AddRoms.vue";
+import CreateCollectionDialog from "@/components/common/Collection/Dialog/CreateCollection.vue";
+import DeleteCollectionDialog from "@/components/common/Collection/Dialog/DeleteCollection.vue";
+import EditCollectionDialog from "@/components/common/Collection/Dialog/EditCollection.vue";
+import RemoveRomsFromCollectionDialog from "@/components/common/Collection/Dialog/RemoveRoms.vue";
 import DeleteAssetDialog from "@/components/common/Game/Dialog/Asset/DeleteAssets.vue";
 import CopyRomDownloadLinkDialog from "@/components/common/Game/Dialog/CopyDownloadLink.vue";
 import DeleteRomDialog from "@/components/common/Game/Dialog/DeleteRom.vue";
 import EditRomDialog from "@/components/common/Game/Dialog/EditRom.vue";
 import MatchRomDialog from "@/components/common/Game/Dialog/MatchRom.vue";
-import SearchCoverDialog from "@/components/common/Game/Dialog/SearchCoverRom.vue";
 import SearchRomDialog from "@/components/common/Game/Dialog/SearchRom.vue";
 import UploadRomDialog from "@/components/common/Game/Dialog/UploadRom.vue";
 import LoadingView from "@/components/common/LoadingView.vue";
+import CollectionsDrawer from "@/components/common/Navigation/CollectionsDrawer.vue";
+import MainAppBar from "@/components/common/Navigation/MainAppBar.vue";
+import MainDrawer from "@/components/common/Navigation/MainDrawer.vue";
+import PlatformsDrawer from "@/components/common/Navigation/PlatformsDrawer.vue";
+import SettingsDrawer from "@/components/common/Navigation/SettingsDrawer.vue";
 import NewVersion from "@/components/common/NewVersion.vue";
 import DeletePlatformDialog from "@/components/common/Platform/Dialog/DeletePlatform.vue";
-import PlatformListItem from "@/components/common/Platform/ListItem.vue";
-import RommIso from "@/components/common/RommIso.vue";
-import identityApi from "@/services/api/identity";
+import SearchCoverDialog from "@/components/common/SearchCover.vue";
 import platformApi from "@/services/api/platform";
 import userApi from "@/services/api/user";
 import storeAuth from "@/stores/auth";
 import storeNavigation from "@/stores/navigation";
 import storePlatforms from "@/stores/platforms";
-import storeScanning from "@/stores/scanning";
 import type { Events } from "@/types/emitter";
-import { defaultAvatarPath } from "@/utils";
 import type { Emitter } from "mitt";
-import { storeToRefs } from "pinia";
-import { inject, onMounted, ref } from "vue";
-import { useRouter } from "vue-router";
+import { inject, onMounted } from "vue";
 import { useDisplay } from "vuetify";
 
 // Props
 const { smAndDown } = useDisplay();
-const scanningStore = storeScanning();
-const { scanning } = storeToRefs(scanningStore);
 const navigationStore = storeNavigation();
 const platformsStore = storePlatforms();
-const { activePlatformsDrawer, activeSettingsDrawer } =
-  storeToRefs(navigationStore);
-const router = useRouter();
 const auth = storeAuth();
 const emitter = inject<Emitter<Events>>("emitter");
 emitter?.on("refreshDrawer", async () => {
@@ -52,45 +50,6 @@ emitter?.on("refreshDrawer", async () => {
 });
 
 // Functions
-function goHome() {
-  navigationStore.resetDrawers();
-  router.push({ name: "dashboard" });
-}
-
-function goScan() {
-  navigationStore.resetDrawers();
-  router.push({ name: "scan" });
-}
-
-function togglePlatformsDrawer() {
-  activeSettingsDrawer.value = false;
-  navigationStore.switchActivePlatformsDrawer();
-}
-
-function toggleSettingsDrawer() {
-  activePlatformsDrawer.value = false;
-  navigationStore.switchActiveSettingsDrawer();
-}
-
-async function logout() {
-  identityApi
-    .logout()
-    .then(({ data }) => {
-      emitter?.emit("snackbarShow", {
-        msg: data.msg,
-        icon: "mdi-check-bold",
-        color: "green",
-      });
-      router.push({ name: "login" });
-    })
-    .catch(() => {
-      router.push({ name: "login" });
-    })
-    .finally(() => {
-      auth.setUser(null);
-    });
-}
-
 onMounted(async () => {
   navigationStore.resetDrawers();
   await userApi
@@ -114,254 +73,25 @@ onMounted(async () => {
 </script>
 
 <template>
-  <v-progress-linear
-    color="romm-accent-1"
-    :active="scanning"
-    :indeterminate="true"
-    absolute
-  />
-
-  <!-- TODO: refactor and extract components -->
-  <v-navigation-drawer
-    v-if="!smAndDown"
-    permanent
-    rail
-    :floating="activePlatformsDrawer || activeSettingsDrawer"
-    rail-width="60"
-  >
-    <template #prepend>
-      <v-row no-gutters class="my-2 justify-center">
-        <router-link :to="{ name: 'dashboard' }">
-          <v-hover v-slot="{ isHovering, props: hoverProps }">
-            <romm-iso
-              v-bind="hoverProps"
-              :class="{ 'border-romm-accent-1': isHovering }"
-              :size="40"
-            />
-          </v-hover>
-        </router-link>
-      </v-row>
-      <v-row no-gutters class="my-4 justify-center">
-        <v-btn
-          icon="mdi-magnify"
-          size="small"
-          variant="flat"
-          @click="emitter?.emit('showSearchRomDialog', null)"
-        />
-        <v-btn
-          v-if="auth.scopes.includes('roms.write')"
-          icon="mdi-upload"
-          size="small"
-          variant="flat"
-          @click="emitter?.emit('showUploadRomDialog', null)"
-        />
-      </v-row>
-    </template>
-    <v-row no-gutters class="justify-center">
-      <v-btn
-        block
-        rounded="0"
-        variant="flat"
-        :color="activePlatformsDrawer ? 'terciary' : ''"
-        icon
-        @click="togglePlatformsDrawer"
-        ><v-icon :color="$route.name == 'platform' ? 'romm-accent-1' : ''"
-          >mdi-controller</v-icon
-        ></v-btn
-      >
-      <v-btn
-        v-if="auth.scopes.includes('platforms.write')"
-        block
-        rounded="0"
-        variant="flat"
-        color="primary"
-        icon
-        @click="goScan"
-        ><v-icon :color="$route.name == 'scan' ? 'romm-accent-1' : ''"
-          >mdi-magnify-scan</v-icon
-        ></v-btn
-      >
-    </v-row>
-    <template #append>
-      <v-row no-gutters class="justify-center">
-        <v-hover v-slot="{ isHovering, props: hoverProps }">
-          <v-avatar
-            v-bind="hoverProps"
-            :class="{ 'border-romm-accent-1': isHovering }"
-            @click="toggleSettingsDrawer"
-            size="35"
-            class="my-2 pointer"
-          >
-            <v-img
-              :src="
-                auth.user?.avatar_path
-                  ? `/assets/romm/assets/${auth.user?.avatar_path}?ts=${auth.user?.updated_at}`
-                  : defaultAvatarPath
-              "
-            />
-          </v-avatar>
-        </v-hover>
-      </v-row>
-    </template>
-  </v-navigation-drawer>
+  <main-drawer v-if="!smAndDown" />
 
-  <v-app-bar
-    v-if="smAndDown"
-    :elevation="0"
-    class="bg-primary justify-center"
-    mode="shift"
-    height="45"
-  >
-    <template #prepend>
-      <v-hover v-slot="{ isHovering, props: hoverProps }">
-        <romm-iso
-          @click="goHome"
-          v-bind="hoverProps"
-          class="pointer ml-1"
-          :class="{ 'border-romm-accent-1': isHovering }"
-          :size="35"
-        />
-      </v-hover>
-    </template>
+  <main-app-bar v-if="smAndDown" />
 
-    <v-btn
-      rounded="0"
-      variant="flat"
-      :color="activePlatformsDrawer ? 'terciary' : ''"
-      icon
-      @click="togglePlatformsDrawer"
-      ><v-icon :color="$route.name == 'platform' ? 'romm-accent-1' : ''"
-        >mdi-controller</v-icon
-      ></v-btn
-    >
-    <v-btn
-      v-if="auth.scopes.includes('platforms.write')"
-      rounded="0"
-      variant="flat"
-      color="primary"
-      icon
-      @click="goScan"
-      ><v-icon :color="$route.name == 'scan' ? 'romm-accent-1' : ''"
-        >mdi-magnify-scan</v-icon
-      ></v-btn
-    >
-    <template #append>
-      <v-btn
-        icon="mdi-magnify"
-        size="small"
-        variant="flat"
-        @click="emitter?.emit('showSearchRomDialog', null)"
-      />
-      <v-btn
-        v-if="auth.scopes.includes('roms.write')"
-        icon="mdi-upload"
-        size="small"
-        variant="flat"
-        class="mr-1"
-        @click="emitter?.emit('showUploadRomDialog', null)"
-      />
-      <v-hover v-slot="{ isHovering, props: hoverProps }">
-        <v-avatar
-          @click="toggleSettingsDrawer"
-          class="mr-1 pointer"
-          size="35"
-          v-bind="hoverProps"
-          :class="{ 'border-romm-accent-1': isHovering }"
-        >
-          <v-img
-            :src="
-              auth.user?.avatar_path
-                ? `/assets/romm/assets/${auth.user?.avatar_path}?ts=${auth.user?.updated_at}`
-                : defaultAvatarPath
-            "
-          />
-        </v-avatar>
-      </v-hover>
-    </template>
-  </v-app-bar>
+  <platforms-drawer />
 
-  <v-navigation-drawer
-    :location="smAndDown ? 'top' : 'left'"
-    mobile
-    width="400"
-    v-model="activePlatformsDrawer"
-    class="bg-terciary"
-  >
-    <v-list rounded="0" class="pa-0">
-      <platform-list-item
-        v-for="platform in platformsStore.filledPlatforms"
-        :key="platform.slug"
-        :platform="platform"
-        class="py-4"
-      />
-    </v-list>
-  </v-navigation-drawer>
+  <collections-drawer />
 
-  <v-navigation-drawer
-    :location="smAndDown ? 'top' : 'left'"
-    mobile
-    width="300"
-    v-model="activeSettingsDrawer"
-    class="bg-terciary"
-  >
-    <v-list rounded="0" class="pa-0">
-      <v-list-img>
-        <v-img
-          :src="
-            auth.user?.avatar_path
-              ? `/assets/romm/assets/${auth.user?.avatar_path}?ts=${auth.user?.updated_at}`
-              : defaultAvatarPath
-          "
-          cover
-        >
-        </v-img>
-      </v-list-img>
-      <v-list-item class="mb-1 text-shadow text-white">
-        <template #title>
-          <span>{{ auth.user?.username }}</span>
-        </template>
-        <template #subtitle>
-          <span>{{ auth.user?.role }}</span>
-        </template>
-      </v-list-item>
-    </v-list>
-    <v-list rounded="0" class="pa-0">
-      <v-list-item :to="{ name: 'settings' }" append-icon="mdi-palette"
-        >UI Settings</v-list-item
-      >
-      <v-list-item
-        v-if="auth.scopes.includes('platforms.write')"
-        append-icon="mdi-table-cog"
-        :to="{ name: 'management' }"
-        >Library Management
-      </v-list-item>
-      <v-list-item
-        v-if="auth.scopes.includes('users.write')"
-        :to="{ name: 'administration' }"
-        append-icon="mdi-security"
-        >Administration</v-list-item
-      >
-      <template v-if="smAndDown">
-        <v-divider />
-        <v-list-item @click="logout" append-icon="mdi-location-exit"
-          >Logout</v-list-item
-        >
-      </template>
-    </v-list>
-    <template v-if="!smAndDown" #append>
-      <v-list rounded="0" class="pa-0">
-        <v-divider />
-        <v-list-item @click="logout" append-icon="mdi-location-exit"
-          >Logout</v-list-item
-        >
-      </v-list>
-    </template>
-  </v-navigation-drawer>
+  <settings-drawer />
 
   <new-version />
   <router-view />
 
   <delete-platform-dialog />
+  <create-collection-dialog />
+  <edit-collection-dialog />
+  <add-roms-to-collection-dialog />
+  <remove-roms-from-collection-dialog />
+  <delete-collection-dialog />
   <search-rom-dialog />
   <match-rom-dialog />
   <search-cover-dialog />
@@ -381,8 +111,7 @@ onMounted(async () => {
   <loading-view />
 </template>
 <style scoped>
-.v-progress-linear,
-.v-bottom-navigation {
+.v-progress-linear {
   z-index: 9999 !important;
 }
 </style>
diff --git a/frontend/src/views/Play/Base.vue b/frontend/src/views/Play/Base.vue
index 2bcb1358d..ac27b39d3 100644
--- a/frontend/src/views/Play/Base.vue
+++ b/frontend/src/views/Play/Base.vue
@@ -81,7 +81,7 @@ onMounted(async () => {
       :md="!gameRunning ? 8 : 4"
       :xl="!gameRunning ? 6 : 2"
     >
-      <v-row class="px-3" no-gutters>
+      <v-row class="px-3 mt-6" no-gutters>
         <v-col>
           <v-img
             class="mx-auto"
@@ -91,15 +91,7 @@ onMounted(async () => {
           <v-divider class="my-4" />
           <v-list-item class="px-2">
             <template #prepend>
-              <r-avatar
-                :src="
-                  !rom.igdb_id && !rom.moby_id
-                    ? `/assets/default/cover/small_${theme.global.name.value}_unmatched.png`
-                    : rom.has_cover
-                    ? `/assets/romm/resources/${rom.path_cover_s}?ts=${rom.updated_at}`
-                    : `/assets/default/cover/small_${theme.global.name.value}_missing_cover.png`
-                "
-              />
+              <r-avatar :rom="rom" />
             </template>
             <v-row no-gutters
               ><v-col>{{ rom.name }}</v-col></v-row
@@ -178,8 +170,6 @@ onMounted(async () => {
               })) ?? []
             "
           />
-          <!-- TODO: diisable selector when start playing -->
-          <!-- TODO: reset emulation to re-select -->
           <!-- <v-select
             class="my-1"
             hide-details
diff --git a/frontend/src/views/Scan.vue b/frontend/src/views/Scan.vue
index c6e2c396d..4901b7b0f 100644
--- a/frontend/src/views/Scan.vue
+++ b/frontend/src/views/Scan.vue
@@ -7,7 +7,7 @@ import storePlatforms, { type Platform } from "@/stores/platforms";
 import storeScanning from "@/stores/scanning";
 import { storeToRefs } from "pinia";
 import { computed, ref, watch } from "vue";
-import { useDisplay, useTheme } from "vuetify";
+import { useDisplay } from "vuetify";
 
 // Props
 const { xs, smAndDown } = useDisplay();
@@ -16,7 +16,6 @@ const { scanning, scanningPlatforms, scanStats } = storeToRefs(scanningStore);
 const platforms = storePlatforms();
 const heartbeat = storeHeartbeat();
 const platformsToScan = ref<Platform[]>([]);
-const theme = useTheme();
 const panels = ref([0]);
 const panelIndex = ref(0);
 // Use a computed property to reactively update metadataOptions based on heartbeat
@@ -71,9 +70,6 @@ const scanOptions = [
 ];
 const scanType = ref("quick");
 
-// Connect to socket on load to catch running scans
-if (!socket.connected) socket.connect();
-
 async function scan() {
   scanningStore.set(true);
   scanningPlatforms.value = [];
@@ -107,7 +103,7 @@ async function stopScan() {
         v-model="platformsToScan"
         label="Platforms"
         item-title="name"
-        :items="platforms.value"
+        :items="platforms.all"
         variant="outlined"
         density="comfortable"
         multiple
@@ -338,15 +334,7 @@ async function stopScan() {
               :to="{ name: 'rom', params: { rom: rom.id } }"
             >
               <template #prepend>
-                <r-avatar
-                  :src="
-                    !rom.igdb_id && !rom.moby_id
-                      ? `/assets/default/cover/small_${theme.global.name.value}_unmatched.png`
-                      : rom.has_cover
-                      ? `/assets/romm/resources/${rom.path_cover_s}?ts=${rom.updated_at}`
-                      : `/assets/default/cover/small_${theme.global.name.value}_missing_cover.png`
-                  "
-                />
+                <r-avatar :rom="rom" />
               </template>
               <v-row no-gutters>
                 <span
diff --git a/frontend/tsconfig.json b/frontend/tsconfig.json
index ee0b2a2b4..e565a9fb7 100644
--- a/frontend/tsconfig.json
+++ b/frontend/tsconfig.json
@@ -10,6 +10,7 @@
     "noImplicitAny": true,
     "paths": {
       "@/*": ["./src/*"]
-    }
+    },
+    "types": ["./src/plugins/pinia.d.ts"]
   }
 }