diff --git a/files/assets/images/badges/agendaposter.png b/files/assets/images/badges/agendaposter.gif
similarity index 100%
rename from files/assets/images/badges/agendaposter.png
rename to files/assets/images/badges/agendaposter.gif
diff --git a/files/assets/images/badges/alpha.png b/files/assets/images/badges/alpha.gif
similarity index 100%
rename from files/assets/images/badges/alpha.png
rename to files/assets/images/badges/alpha.gif
diff --git a/files/assets/images/badges/art.png b/files/assets/images/badges/art.gif
similarity index 100%
rename from files/assets/images/badges/art.png
rename to files/assets/images/badges/art.gif
diff --git a/files/assets/images/badges/baby.png b/files/assets/images/badges/baby.gif
similarity index 100%
rename from files/assets/images/badges/baby.png
rename to files/assets/images/badges/baby.gif
diff --git a/files/assets/images/badges/beta.png b/files/assets/images/badges/beta.gif
similarity index 100%
rename from files/assets/images/badges/beta.png
rename to files/assets/images/badges/beta.gif
diff --git a/files/assets/images/badges/git.png b/files/assets/images/badges/git.gif
similarity index 100%
rename from files/assets/images/badges/git.png
rename to files/assets/images/badges/git.gif
diff --git a/files/assets/images/badges/idea.png b/files/assets/images/badges/idea.gif
similarity index 100%
rename from files/assets/images/badges/idea.png
rename to files/assets/images/badges/idea.gif
diff --git a/files/assets/images/badges/labrat.png b/files/assets/images/badges/labrat.gif
similarity index 100%
rename from files/assets/images/badges/labrat.png
rename to files/assets/images/badges/labrat.gif
diff --git a/files/assets/images/badges/lolcow.png b/files/assets/images/badges/lolcow.gif
similarity index 100%
rename from files/assets/images/badges/lolcow.png
rename to files/assets/images/badges/lolcow.gif
diff --git a/files/assets/images/badges/mail.png b/files/assets/images/badges/mail.gif
similarity index 100%
rename from files/assets/images/badges/mail.png
rename to files/assets/images/badges/mail.gif
diff --git a/files/assets/images/badges/marseybadge-1.png b/files/assets/images/badges/marseybadge-1.gif
similarity index 100%
rename from files/assets/images/badges/marseybadge-1.png
rename to files/assets/images/badges/marseybadge-1.gif
diff --git a/files/assets/images/badges/marseybadge-2.png b/files/assets/images/badges/marseybadge-2.gif
similarity index 100%
rename from files/assets/images/badges/marseybadge-2.png
rename to files/assets/images/badges/marseybadge-2.gif
diff --git a/files/assets/images/badges/recruit-1.png b/files/assets/images/badges/recruit-1.gif
similarity index 100%
rename from files/assets/images/badges/recruit-1.png
rename to files/assets/images/badges/recruit-1.gif
diff --git a/files/assets/images/badges/recruit-10.png b/files/assets/images/badges/recruit-10.gif
similarity index 100%
rename from files/assets/images/badges/recruit-10.png
rename to files/assets/images/badges/recruit-10.gif
diff --git a/files/assets/images/badges/recruit-100.png b/files/assets/images/badges/recruit-100.gif
similarity index 100%
rename from files/assets/images/badges/recruit-100.png
rename to files/assets/images/badges/recruit-100.gif
diff --git a/files/assets/images/badges/recruit-1000.png b/files/assets/images/badges/recruit-1000.gif
similarity index 100%
rename from files/assets/images/badges/recruit-1000.png
rename to files/assets/images/badges/recruit-1000.gif
diff --git a/files/assets/images/badges/retarded.png b/files/assets/images/badges/retarded.gif
similarity index 100%
rename from files/assets/images/badges/retarded.png
rename to files/assets/images/badges/retarded.gif
diff --git a/files/assets/images/badges/sitebreaker.png b/files/assets/images/badges/sitebreaker.gif
similarity index 100%
rename from files/assets/images/badges/sitebreaker.png
rename to files/assets/images/badges/sitebreaker.gif
diff --git a/files/assets/images/badges/whitehat.png b/files/assets/images/badges/whitehat.gif
similarity index 100%
rename from files/assets/images/badges/whitehat.png
rename to files/assets/images/badges/whitehat.gif
diff --git a/files/assets/images/badges/year-1.png b/files/assets/images/badges/year-1.gif
similarity index 100%
rename from files/assets/images/badges/year-1.png
rename to files/assets/images/badges/year-1.gif
diff --git a/files/routes/static.py b/files/routes/static.py
index 1c7e57ee2..9f14e45e1 100644
--- a/files/routes/static.py
+++ b/files/routes/static.py
@@ -134,8 +134,11 @@ def archives(path):
 @limiter.exempt
 def static_service(path):
 	resp = make_response(send_from_directory('./assets', path))
-	if request.path.endswith('.css'): resp.headers.add("Content-Type", "text/css")
-	if request.path.endswith('.gif') or request.path.endswith('.ttf') or request.path.endswith('.woff') or request.path.endswith('.woff2'):
+	if request.path.endswith('.css'):
+		resp.headers.add("Content-Type", "text/css")
+		resp.headers.remove("Cache-Control")
+		resp.headers.add("Cache-Control", "public, max-age=86400")
+	elif request.path.endswith('.gif') or request.path.endswith('.png') or request.path.endswith('.ttf') or request.path.endswith('.woff') or request.path.endswith('.woff2'):
 		resp.headers.remove("Cache-Control")
 		resp.headers.add("Cache-Control", "public, max-age=31556952")