diff --git a/app/features/calendar/routes/calendar.tsx b/app/features/calendar/routes/calendar.tsx
index 7e5278b58..bd3a44b15 100644
--- a/app/features/calendar/routes/calendar.tsx
+++ b/app/features/calendar/routes/calendar.tsx
@@ -12,7 +12,6 @@ import { Flipped, Flipper } from "react-flip-toolkit";
 import { useTranslation } from "react-i18next";
 import { z } from "zod";
 import { Alert } from "~/components/Alert";
-import { Avatar } from "~/components/Avatar";
 import { LinkButton } from "~/components/Button";
 import { Divider } from "~/components/Divider";
 import { Main } from "~/components/Main";
@@ -45,6 +44,7 @@ import { actualNumber } from "~/utils/zod";
 import * as CalendarRepository from "../CalendarRepository.server";
 import { canAddNewEvent } from "../calendar-utils";
 import { Tags } from "../components/Tags";
+import { Image } from "~/components/Image";
 
 import "~/styles/calendar.css";
 
@@ -416,11 +416,13 @@ function EventsList({
                       <div className="stack xs">
                         <div className="stack horizontal sm-plus items-center">
                           {calendarEvent.tournamentId ? (
-                            <Avatar
-                              size="sm"
-                              url={HACKY_resolvePicture({
+                            <Image
+                              path={HACKY_resolvePicture({
                                 name: calendarEvent.name,
                               })}
+                              alt=""
+                              size={40}
+                              className="rounded-full"
                             />
                           ) : null}
                           <div>
diff --git a/app/features/front-page/routes/index.tsx b/app/features/front-page/routes/index.tsx
index 64f0b0a32..b5568ed2e 100644
--- a/app/features/front-page/routes/index.tsx
+++ b/app/features/front-page/routes/index.tsx
@@ -171,7 +171,12 @@ function TournamentCard({
       }}
     >
       <div className="stack horizontal justify-between items-center">
-        <Avatar url={HACKY_resolvePicture(tournament)} size="xxs" />
+        <Image
+          path={HACKY_resolvePicture(tournament)}
+          size={24}
+          className="rounded-full"
+          alt=""
+        />
         <div
           className={clsx("front__tournament-card__time", {
             invisible: !isMounted,
diff --git a/app/features/tournament/routes/to.$id.register.tsx b/app/features/tournament/routes/to.$id.register.tsx
index eff04a922..53146b6d1 100644
--- a/app/features/tournament/routes/to.$id.register.tsx
+++ b/app/features/tournament/routes/to.$id.register.tsx
@@ -269,12 +269,11 @@ export default function TournamentRegisterPage() {
   return (
     <div className="stack lg">
       <div className="tournament__logo-container">
-        <img
-          src={tournament.logoSrc}
+        <Image
+          path={tournament.logoSrc}
           alt=""
           className="tournament__logo"
-          width={124}
-          height={124}
+          size={124}
         />
         <div>
           <div className="tournament__title">{tournament.ctx.name}</div>
diff --git a/app/utils/urls.ts b/app/utils/urls.ts
index 00d9b3487..99f9de478 100644
--- a/app/utils/urls.ts
+++ b/app/utils/urls.ts
@@ -370,7 +370,7 @@ export const preferenceEmojiUrl = (preference?: Preference) => {
   return `/static-assets/img/emoji/${emoji}.svg`;
 };
 export const tournamentLogoUrl = (identifier: string) =>
-  `/static-assets/img/tournament-logos/${identifier}.png`;
+  `/static-assets/img/tournament-logos/${identifier}`;
 export const TIER_PLUS_URL = `/static-assets/img/tiers/plus`;
 
 export const winnersImageUrl = ({
diff --git a/public/static-assets/img/tournament-logos/default.avif b/public/static-assets/img/tournament-logos/default.avif
new file mode 100644
index 000000000..3364d2366
Binary files /dev/null and b/public/static-assets/img/tournament-logos/default.avif differ
diff --git a/public/static-assets/img/tournament-logos/ftiu.avif b/public/static-assets/img/tournament-logos/ftiu.avif
new file mode 100644
index 000000000..c4177ebb7
Binary files /dev/null and b/public/static-assets/img/tournament-logos/ftiu.avif differ
diff --git a/public/static-assets/img/tournament-logos/itz.avif b/public/static-assets/img/tournament-logos/itz.avif
new file mode 100644
index 000000000..77397dfe5
Binary files /dev/null and b/public/static-assets/img/tournament-logos/itz.avif differ
diff --git a/public/static-assets/img/tournament-logos/pg.avif b/public/static-assets/img/tournament-logos/pg.avif
new file mode 100644
index 000000000..32beaedb1
Binary files /dev/null and b/public/static-assets/img/tournament-logos/pg.avif differ
diff --git a/public/static-assets/img/tournament-logos/pn.avif b/public/static-assets/img/tournament-logos/pn.avif
new file mode 100644
index 000000000..b26c80c68
Binary files /dev/null and b/public/static-assets/img/tournament-logos/pn.avif differ
diff --git a/public/static-assets/img/tournament-logos/pp.avif b/public/static-assets/img/tournament-logos/pp.avif
new file mode 100644
index 000000000..dec998077
Binary files /dev/null and b/public/static-assets/img/tournament-logos/pp.avif differ
diff --git a/public/static-assets/img/tournament-logos/sf.avif b/public/static-assets/img/tournament-logos/sf.avif
new file mode 100644
index 000000000..653fbf2fa
Binary files /dev/null and b/public/static-assets/img/tournament-logos/sf.avif differ
diff --git a/public/static-assets/img/tournament-logos/sos.avif b/public/static-assets/img/tournament-logos/sos.avif
new file mode 100644
index 000000000..328c54d50
Binary files /dev/null and b/public/static-assets/img/tournament-logos/sos.avif differ
diff --git a/public/static-assets/img/tournament-logos/tc.avif b/public/static-assets/img/tournament-logos/tc.avif
new file mode 100644
index 000000000..5f0b73b4c
Binary files /dev/null and b/public/static-assets/img/tournament-logos/tc.avif differ