diff --git a/README.md b/README.md
index fd834ed..064b928 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 <div align="center">
-<img src="./src/assets/images/webp/favicon.webp"/>
+<img src="./public/images/webp/favicon.webp"/>
 <h1>RustLings-Web</h1>
 </div>
 
diff --git a/src/assets/Rust_Lang_ES_Logo_Blanco_color.svg b/public/Rust_Lang_ES_Logo_Blanco_color.svg
similarity index 100%
rename from src/assets/Rust_Lang_ES_Logo_Blanco_color.svg
rename to public/Rust_Lang_ES_Logo_Blanco_color.svg
diff --git a/src/assets/Rust_Lang_ES_Logo_Negro_blanco.svg b/public/Rust_Lang_ES_Logo_Negro_blanco.svg
similarity index 100%
rename from src/assets/Rust_Lang_ES_Logo_Negro_blanco.svg
rename to public/Rust_Lang_ES_Logo_Negro_blanco.svg
diff --git a/src/assets/Rust_Lang_ES_Logo_Negro_color.svg b/public/Rust_Lang_ES_Logo_Negro_color.svg
similarity index 100%
rename from src/assets/Rust_Lang_ES_Logo_Negro_color.svg
rename to public/Rust_Lang_ES_Logo_Negro_color.svg
diff --git a/src/assets/images/figures.svg b/public/images/figures.svg
similarity index 100%
rename from src/assets/images/figures.svg
rename to public/images/figures.svg
diff --git a/src/assets/images/webp/404.png b/public/images/webp/404.png
similarity index 100%
rename from src/assets/images/webp/404.png
rename to public/images/webp/404.png
diff --git a/src/assets/images/webp/404.webp b/public/images/webp/404.webp
similarity index 100%
rename from src/assets/images/webp/404.webp
rename to public/images/webp/404.webp
diff --git a/src/assets/images/webp/404_image.png b/public/images/webp/404_image.png
similarity index 100%
rename from src/assets/images/webp/404_image.png
rename to public/images/webp/404_image.png
diff --git a/src/assets/images/webp/discord-mark-white.webp b/public/images/webp/discord-mark-white.webp
similarity index 100%
rename from src/assets/images/webp/discord-mark-white.webp
rename to public/images/webp/discord-mark-white.webp
diff --git a/src/assets/images/webp/favicon-3.webp b/public/images/webp/favicon-3.webp
similarity index 100%
rename from src/assets/images/webp/favicon-3.webp
rename to public/images/webp/favicon-3.webp
diff --git a/src/assets/images/webp/favicon.webp b/public/images/webp/favicon.webp
similarity index 100%
rename from src/assets/images/webp/favicon.webp
rename to public/images/webp/favicon.webp
diff --git a/src/assets/images/webp/ferris.webp b/public/images/webp/ferris.webp
similarity index 100%
rename from src/assets/images/webp/ferris.webp
rename to public/images/webp/ferris.webp
diff --git a/src/assets/images/webp/ferris_cooking.jpg b/public/images/webp/ferris_cooking.jpg
similarity index 100%
rename from src/assets/images/webp/ferris_cooking.jpg
rename to public/images/webp/ferris_cooking.jpg
diff --git a/src/assets/images/webp/logo.webp b/public/images/webp/logo.webp
similarity index 100%
rename from src/assets/images/webp/logo.webp
rename to public/images/webp/logo.webp
diff --git a/src/components/CookieBanner.astro b/src/components/CookieBanner.astro
index cf31630..2bcd700 100644
--- a/src/components/CookieBanner.astro
+++ b/src/components/CookieBanner.astro
@@ -1,6 +1,4 @@
 ---
-import { Image } from "astro:assets"
-import ferrisCooking from "~/assets/images/webp/ferris_cooking.jpg"
 
 import { defaultLang, ui } from "~/i18n/ui"
 
@@ -21,8 +19,8 @@ const projectId = import.meta.env.VITE_CLARITY_PROJECT_ID
     class="w-full max-w-2xl max-h-[90vh] bg-editor-bg border border-stroke-color rounded-xl shadow-2xl overflow-hidden grid grid-cols-1 md:grid-cols-2"
   >
     <div class="relative aspect-4/3 md:aspect-auto">
-      <Image
-        src={ferrisCooking}
+      <img
+        src="/images/webp/ferris_cooking.jpg"
         alt={t("cookie.banner.img.alt")}
         class="absolute inset-0 w-full h-full object-cover"
       />
diff --git a/src/features/home/components/Hero.astro b/src/features/home/components/Hero.astro
index fd9e0bd..7c40b04 100644
--- a/src/features/home/components/Hero.astro
+++ b/src/features/home/components/Hero.astro
@@ -146,12 +146,6 @@ const t = useTranslations(lang)
       ))}
     </div>
   </div>
-
-  <!-- Scroll indicator -->
-  <div class="absolute bottom-8 left-1/2 -translate-x-1/2 flex flex-col items-center gap-1.5 text-secondary/20">
-    <span class="text-xs tracking-widest uppercase font-medium">{t("hero.scroll")}</span>
-    <div class="w-px h-8 bg-linear-to-b from-secondary/20 to-transparent"></div>
-  </div>
 </Section>
 
 <script>
diff --git a/src/features/home/components/Playground.astro b/src/features/home/components/Playground.astro
index 64fae39..2f4029c 100644
--- a/src/features/home/components/Playground.astro
+++ b/src/features/home/components/Playground.astro
@@ -1,6 +1,4 @@
 ---
-import { Image } from "astro:assets"
-import ferrisImage from "~/assets/images/webp/ferris.webp"
 import Section from "~/components/sections/Section.astro"
 import { getLangFromUrl, useTranslations } from "~/i18n/utils"
 import IconCheck from "~icons/tabler/check"
@@ -80,9 +78,9 @@ const t = useTranslations(lang)
 
       <!-- Features side -->
       <div class="w-full lg:w-2/5 flex flex-col items-center lg:items-start gap-8">
-        <Image
+        <img
           class="w-28 h-auto"
-          src={ferrisImage}
+          src="/images/webp/ferris.webp"
           alt={t("playground.ferris_alt")}
         />
 
diff --git a/src/layouts/Layout.astro b/src/layouts/Layout.astro
index 6b7f609..00b421f 100644
--- a/src/layouts/Layout.astro
+++ b/src/layouts/Layout.astro
@@ -3,7 +3,6 @@ import { ClientRouter } from "astro:transitions"
 import "~/styles/global.css"
 import "sweetalert2/dist/sweetalert2.min.css"
 import "driver.js/dist/driver.css"
-import favicon from "~/assets/images/webp/favicon.webp"
 import CookieBanner from "~/components/CookieBanner.astro"
 import { getLangFromUrl } from "~/i18n/utils"
 
@@ -20,7 +19,7 @@ const lang = Astro.locals.lang ?? getLangFromUrl(Astro.url)
   <head>
     <meta charset="UTF-8" />
     <title>{title}</title>
-    <link rel="icon" type="image/webp" href={favicon.src} />
+    <link rel="icon" type="image/webp" href="/images/webp/favicon.webp" />
     <meta name="description" content={description} />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <ClientRouter />
diff --git a/src/pages/404.astro b/src/pages/404.astro
index 1579a46..fa9f3be 100644
--- a/src/pages/404.astro
+++ b/src/pages/404.astro
@@ -1,6 +1,4 @@
 ---
-import { Image } from "astro:assets"
-//import img404 from "~/assets/images/webp/404_image.png"
 import { getLangFromUrl, useTranslations } from "~/i18n/utils"
 import Layout from "~/layouts/Layout.astro"
 import IconLeft from "~icons/tabler/arrow-big-left-lines-filled"
@@ -15,8 +13,8 @@ const t = useTranslations(lang)
   <main class="flex-1 flex flex-col items-center justify-center px-4 gap-8">
     <!-- Temporally disabled (corrupted image) -->
     <!--
-    <Image
-      src={img404}
+    <img
+      src="/images/webp/404_image.png"
       alt={t("404.image_alt")}
       class="w-full max-w-lg h-auto select-none pointer-events-none"
     />
diff --git a/src/pages/[lang]/certificado/[trackId].astro b/src/pages/[lang]/certificado/[trackId].astro
index fff7f54..9abf6b9 100644
--- a/src/pages/[lang]/certificado/[trackId].astro
+++ b/src/pages/[lang]/certificado/[trackId].astro
@@ -1,5 +1,4 @@
 ---
-import logoSvgUrl from "~/assets/Rust_Lang_ES_Logo_Blanco_color.svg?url"
 import { tracks } from "~/const/tracks"
 import { getLangFromUrl, useTranslations } from "~/i18n/utils"
 import Layout from "~/layouts/Layout.astro"
@@ -16,6 +15,7 @@ export function getStaticPaths() {
 		])
 }
 
+const logoSvgUrl = "/Rust_Lang_ES_Logo_Blanco_color.svg"
 const { track } = Astro.props
 const lang = getLangFromUrl(Astro.url)
 const t = useTranslations(lang)
@@ -135,10 +135,7 @@ const t = useTranslations(lang)
           data-badge-certification={t("certificate.badge_certification")}
           data-track-title={t(track.title)}
           data-track-id={track.id}
-<<<<<<< Updated upstream
-=======
           data-lang={lang}
->>>>>>> Stashed changes
         ></canvas>
 
         <button
diff --git a/src/pages/[lang]/verificar/[certId].astro b/src/pages/[lang]/verificar/[certId].astro
index 0b67eaf..0755dcf 100644
--- a/src/pages/[lang]/verificar/[certId].astro
+++ b/src/pages/[lang]/verificar/[certId].astro
@@ -1,11 +1,11 @@
 ---
-import logoSvgUrl from "~/assets/Rust_Lang_ES_Logo_Blanco_color.svg?url"
 import { tracks } from "~/const/tracks"
 import { getLangFromUrl, useTranslations } from "~/i18n/utils"
 import Layout from "~/layouts/Layout.astro"
 import IconLeft from "~icons/tabler/arrow-big-left-lines-filled"
 import IconCertificate from "~icons/tabler/certificate"
 
+const logoSvgUrl = "/Rust_Lang_ES_Logo_Blanco_color.svg"
 const { certId } = Astro.params
 const { DB } = Astro.locals.runtime.env
 const lang = getLangFromUrl(Astro.url)