diff --git a/files/helpers/sanitize.py b/files/helpers/sanitize.py
index 9449c9026..3125614a4 100644
--- a/files/helpers/sanitize.py
+++ b/files/helpers/sanitize.py
@@ -121,7 +121,7 @@ def sanitize(sanitized, noimages=False):
 			tag["class"] = "in-comment-image"
 			tag["loading"] = "lazy"
 			tag["data-src"] = tag["src"]
-			tag["src"] = "/assets/images/default_thumb_link.webp"
+			tag["src"] = "/assets/images/loading.webp"
 
 			link = soup.new_tag("a")
 			link["href"] = tag["data-src"]
diff --git a/files/routes/comments.py b/files/routes/comments.py
index f187f548a..ff5522134 100644
--- a/files/routes/comments.py
+++ b/files/routes/comments.py
@@ -232,7 +232,7 @@ def api_comment(v):
 		file=request.files["file"]
 		if not file.content_type.startswith('image/'): return {"error": "That wasn't an image!"}, 400
 
-		name = f'/images/{int(time.time())}{secrets.token_urlsafe(2)}.gif'
+		name = f'/images/{int(time.time())}{secrets.token_urlsafe(2)}.webp2'
 		file.save(name)
 		url = request.host_url[:-1] + process_image(name)
 		
@@ -633,7 +633,7 @@ def edit_comment(cid, v):
 		file=request.files["file"]
 		if not file.content_type.startswith('image/'): return {"error": "That wasn't an image!"}, 400
 
-		name = f'/images/{int(time.time())}{secrets.token_urlsafe(2)}.gif'
+		name = f'/images/{int(time.time())}{secrets.token_urlsafe(2)}.webp2'
 		file.save(name)
 		url = request.host_url[:-1] + process_image(name)
 
diff --git a/files/routes/posts.py b/files/routes/posts.py
index edd35bc37..e0e6f5964 100644
--- a/files/routes/posts.py
+++ b/files/routes/posts.py
@@ -472,7 +472,7 @@ def thumbnail_thread(pid):
 		db.close()
 		return
 
-	name = f'/images/{int(time.time())}{secrets.token_urlsafe(2)}.gif'
+	name = f'/images/{int(time.time())}{secrets.token_urlsafe(2)}.webp2'
 
 	with open(name, "wb") as file:
 		for chunk in image_req.iter_content(1024):
@@ -725,7 +725,7 @@ def submit_post(v):
 				), 403
 
 		if file.content_type.startswith('image/'):
-			name = f'/images/{int(time.time())}{secrets.token_urlsafe(2)}.gif'
+			name = f'/images/{int(time.time())}{secrets.token_urlsafe(2)}.webp2'
 			file.save(name)
 			new_post.url = request.host_url[:-1] + process_image(name)
 			
diff --git a/files/routes/settings.py b/files/routes/settings.py
index 181bf30f7..57da40f22 100644
--- a/files/routes/settings.py
+++ b/files/routes/settings.py
@@ -114,7 +114,7 @@ def settings_profile_post(v):
 				if request.headers.get("Authorization"): return {"error": f"Image files only"}, 400
 				else: return render_template("settings_profile.html", v=v, error=f"Image files only."), 400
 
-			name = f'/images/{int(time.time())}{secrets.token_urlsafe(2)}.gif'
+			name = f'/images/{int(time.time())}{secrets.token_urlsafe(2)}.webp2'
 			file.save(name)
 			url = request.host_url[:-1] + process_image(name)
 
@@ -506,7 +506,7 @@ def settings_images_profile(v):
 
 	file = request.files["profile"]
 
-	name = f'/images/{int(time.time())}{secrets.token_urlsafe(2)}.gif'
+	name = f'/images/{int(time.time())}{secrets.token_urlsafe(2)}.webp2'
 	file.save(name)
 	highres = request.host_url[:-1] + process_image(name)
 
@@ -538,7 +538,7 @@ def settings_images_banner(v):
 
 	file = request.files["banner"]
 
-	name = f'/images/{int(time.time())}{secrets.token_urlsafe(2)}.gif'
+	name = f'/images/{int(time.time())}{secrets.token_urlsafe(2)}.webp2'
 	file.save(name)
 	imageurl = request.host_url[:-1] + process_image(name)