diff --git a/archive/maps/cynosure/cynosure_defines.dm b/archive/maps/cynosure/cynosure_defines.dm
index 6f3bddf6c05..1ed8e454795 100644
--- a/archive/maps/cynosure/cynosure_defines.dm
+++ b/archive/maps/cynosure/cynosure_defines.dm
@@ -13,7 +13,7 @@
 	full_name = "Cynosure Station"
 	path = "cynosure"
 
-	lobby_screens = list('html/lobby/mockingjay00.gif') // New lobby screen if possible.
+	lobby_screens = list('html/lobby/mockingjay00.webp') // New lobby screen if possible.
 
 	holomap_smoosh = list(list(
 		Z_LEVEL_STATION_ONE,
diff --git a/archive/maps/example/example_defines.dm b/archive/maps/example/example_defines.dm
index 026236741fe..f700532fd65 100644
--- a/archive/maps/example/example_defines.dm
+++ b/archive/maps/example/example_defines.dm
@@ -6,7 +6,7 @@
 	full_name = "The Test Map"
 	path = "example"
 
-	lobby_screens = list('html/lobby/mockingjay00.gif')
+	lobby_screens = list('html/lobby/mockingjay00.webp')
 
 	zlevel_datum_type = /datum/map_z_level/example
 
diff --git a/archive/maps/northern_star/northern_star_defines.dm b/archive/maps/northern_star/northern_star_defines.dm
index 9a1b18da1b7..c4062cec603 100644
--- a/archive/maps/northern_star/northern_star_defines.dm
+++ b/archive/maps/northern_star/northern_star_defines.dm
@@ -11,7 +11,7 @@
 	full_name = "NCS Northern Star"
 	path = "northern_star"
 
-	lobby_screens = list('html/lobby/mockingjay00.gif')
+	lobby_screens = list('html/lobby/mockingjay00.webp')
 
 	zlevel_datum_type = /datum/map_z_level/northern_star
 
diff --git a/archive/maps/southern_cross/southern_cross_defines.dm b/archive/maps/southern_cross/southern_cross_defines.dm
index bc76086b2a0..de6b27c40c2 100644
--- a/archive/maps/southern_cross/southern_cross_defines.dm
+++ b/archive/maps/southern_cross/southern_cross_defines.dm
@@ -16,7 +16,7 @@
 	full_name = "Southern Cross"
 	path = "southern_cross"
 
-	lobby_screens = list('html/lobby/mockingjay00.gif') // New lobby screen if possible.
+	lobby_screens = list('html/lobby/mockingjay00.webp') // New lobby screen if possible.
 
 	holomap_smoosh = list(list(
 		Z_LEVEL_STATION_ONE,
diff --git a/code/modules/asset_cache/assets/lobby.dm b/code/modules/asset_cache/assets/lobby.dm
index 61aac514e1b..9bec9203c58 100644
--- a/code/modules/asset_cache/assets/lobby.dm
+++ b/code/modules/asset_cache/assets/lobby.dm
@@ -6,5 +6,6 @@
 	)
 
 /datum/asset/simple/lobby_files/register()
+	// not actually a gif
 	assets["lobby_bg.gif"] = pick(using_map.lobby_screens)
 	. = ..()
diff --git a/html/lobby/above3b.gif b/html/lobby/above3b.gif
deleted file mode 100644
index 8c15159cc1f..00000000000
Binary files a/html/lobby/above3b.gif and /dev/null differ
diff --git a/html/lobby/above3b.png b/html/lobby/above3b.png
new file mode 100644
index 00000000000..c5106e785ce
Binary files /dev/null and b/html/lobby/above3b.png differ
diff --git a/html/lobby/endo.gif b/html/lobby/endo.gif
deleted file mode 100644
index 053270cfc12..00000000000
Binary files a/html/lobby/endo.gif and /dev/null differ
diff --git a/html/lobby/endo.png b/html/lobby/endo.png
new file mode 100644
index 00000000000..56ced0f7eb9
Binary files /dev/null and b/html/lobby/endo.png differ
diff --git a/html/lobby/gateway.gif b/html/lobby/gateway.gif
deleted file mode 100644
index c3c09d5625d..00000000000
Binary files a/html/lobby/gateway.gif and /dev/null differ
diff --git a/html/lobby/gateway.png b/html/lobby/gateway.png
new file mode 100644
index 00000000000..f5f4ebfd2f3
Binary files /dev/null and b/html/lobby/gateway.png differ
diff --git a/html/lobby/intothedark.gif b/html/lobby/intothedark.gif
deleted file mode 100644
index 5b5587b3d67..00000000000
Binary files a/html/lobby/intothedark.gif and /dev/null differ
diff --git a/html/lobby/intothedark.png b/html/lobby/intothedark.png
new file mode 100644
index 00000000000..78dfbfde4c8
Binary files /dev/null and b/html/lobby/intothedark.png differ
diff --git a/html/lobby/logo1.gif b/html/lobby/logo1.gif
deleted file mode 100644
index 2d739daf2b8..00000000000
Binary files a/html/lobby/logo1.gif and /dev/null differ
diff --git a/html/lobby/logo1.png b/html/lobby/logo1.png
new file mode 100644
index 00000000000..3987c655f71
Binary files /dev/null and b/html/lobby/logo1.png differ
diff --git a/html/lobby/logo2.gif b/html/lobby/logo2.gif
deleted file mode 100644
index e90918c32e5..00000000000
Binary files a/html/lobby/logo2.gif and /dev/null differ
diff --git a/html/lobby/logo2.png b/html/lobby/logo2.png
new file mode 100644
index 00000000000..92a93b1024e
Binary files /dev/null and b/html/lobby/logo2.png differ
diff --git a/html/lobby/mockingjay00.gif b/html/lobby/mockingjay00.gif
deleted file mode 100644
index 6c9d5e9e5bd..00000000000
Binary files a/html/lobby/mockingjay00.gif and /dev/null differ
diff --git a/html/lobby/mockingjay00.webp b/html/lobby/mockingjay00.webp
new file mode 100644
index 00000000000..eb1622bfd35
Binary files /dev/null and b/html/lobby/mockingjay00.webp differ
diff --git a/html/lobby/rp2.gif b/html/lobby/rp2.gif
deleted file mode 100644
index b81b176a1ff..00000000000
Binary files a/html/lobby/rp2.gif and /dev/null differ
diff --git a/html/lobby/rp2.png b/html/lobby/rp2.png
new file mode 100644
index 00000000000..1088ec00023
Binary files /dev/null and b/html/lobby/rp2.png differ
diff --git a/html/lobby/tether.gif b/html/lobby/tether.gif
deleted file mode 100644
index f597cc3aeac..00000000000
Binary files a/html/lobby/tether.gif and /dev/null differ
diff --git a/html/lobby/tether.png b/html/lobby/tether.png
new file mode 100644
index 00000000000..c54a891ebc9
Binary files /dev/null and b/html/lobby/tether.png differ
diff --git a/html/lobby/tether2_dog.gif b/html/lobby/tether2_dog.gif
deleted file mode 100644
index 76e044d9f54..00000000000
Binary files a/html/lobby/tether2_dog.gif and /dev/null differ
diff --git a/html/lobby/tether2_dog.png b/html/lobby/tether2_dog.png
new file mode 100644
index 00000000000..ba12b9ba8f6
Binary files /dev/null and b/html/lobby/tether2_dog.png differ
diff --git a/html/lobby/tether2_love.gif b/html/lobby/tether2_love.gif
deleted file mode 100644
index fe6b1d2688e..00000000000
Binary files a/html/lobby/tether2_love.gif and /dev/null differ
diff --git a/html/lobby/tether2_love.png b/html/lobby/tether2_love.png
new file mode 100644
index 00000000000..4415dceea04
Binary files /dev/null and b/html/lobby/tether2_love.png differ
diff --git a/html/lobby/tether2_night.gif b/html/lobby/tether2_night.gif
deleted file mode 100644
index ef7a8db1160..00000000000
Binary files a/html/lobby/tether2_night.gif and /dev/null differ
diff --git a/html/lobby/tether2_night.png b/html/lobby/tether2_night.png
new file mode 100644
index 00000000000..66624284e78
Binary files /dev/null and b/html/lobby/tether2_night.png differ
diff --git a/html/lobby/tether_future.gif b/html/lobby/tether_future.gif
deleted file mode 100644
index 2047cf2ab8a..00000000000
Binary files a/html/lobby/tether_future.gif and /dev/null differ
diff --git a/html/lobby/tether_future.png b/html/lobby/tether_future.png
new file mode 100644
index 00000000000..de837511db5
Binary files /dev/null and b/html/lobby/tether_future.png differ
diff --git a/html/lobby/tether_night.gif b/html/lobby/tether_night.gif
deleted file mode 100644
index ed38bfdc563..00000000000
Binary files a/html/lobby/tether_night.gif and /dev/null differ
diff --git a/html/lobby/tether_night.png b/html/lobby/tether_night.png
new file mode 100644
index 00000000000..37a9ea48c23
Binary files /dev/null and b/html/lobby/tether_night.png differ
diff --git a/html/lobby/title.gif b/html/lobby/title.gif
deleted file mode 100644
index 865ef37a5f5..00000000000
Binary files a/html/lobby/title.gif and /dev/null differ
diff --git a/html/lobby/title.png b/html/lobby/title.png
new file mode 100644
index 00000000000..52474d81ff3
Binary files /dev/null and b/html/lobby/title.png differ
diff --git a/html/lobby/title_old.gif b/html/lobby/title_old.gif
deleted file mode 100644
index 81d191502f2..00000000000
Binary files a/html/lobby/title_old.gif and /dev/null differ
diff --git a/html/lobby/title_old.webp b/html/lobby/title_old.webp
new file mode 100644
index 00000000000..78318f9f8f6
Binary files /dev/null and b/html/lobby/title_old.webp differ
diff --git a/html/lobby/virgo3C.gif b/html/lobby/virgo3C.gif
deleted file mode 100644
index 3c8b406b3ac..00000000000
Binary files a/html/lobby/virgo3C.gif and /dev/null differ
diff --git a/html/lobby/virgo3C.png b/html/lobby/virgo3C.png
new file mode 100644
index 00000000000..fcde7d02976
Binary files /dev/null and b/html/lobby/virgo3C.png differ
diff --git a/html/lobby/youcanttaketheskyfromme.gif b/html/lobby/youcanttaketheskyfromme.gif
deleted file mode 100644
index dd7b169f82d..00000000000
Binary files a/html/lobby/youcanttaketheskyfromme.gif and /dev/null differ
diff --git a/html/lobby/youcanttaketheskyfromme.png b/html/lobby/youcanttaketheskyfromme.png
new file mode 100644
index 00000000000..1fc5e42c472
Binary files /dev/null and b/html/lobby/youcanttaketheskyfromme.png differ
diff --git a/maps/groundbase/groundbase_defines.dm b/maps/groundbase/groundbase_defines.dm
index 49bb8000734..53a7af2c359 100644
--- a/maps/groundbase/groundbase_defines.dm
+++ b/maps/groundbase/groundbase_defines.dm
@@ -1,11 +1,11 @@
 /datum/map/groundbase/New()
 	..()
 	var/choice = pickweight(list(
-		'html/lobby/virgo3C.gif' = 200,
-		'html/lobby/rp2.gif' = 200,
-		'html/lobby/logo1.gif' = 20,
-		'html/lobby/logo2.gif' = 20,
-		'html/lobby/gateway.gif' = 5
+		'html/lobby/virgo3C.png' = 200,
+		'html/lobby/rp2.png' = 200,
+		'html/lobby/logo1.png' = 20,
+		'html/lobby/logo2.png' = 20,
+		'html/lobby/gateway.png' = 5
 	))
 	if(choice)
 		lobby_screens = list(choice)
@@ -23,7 +23,7 @@
 
 	zlevel_datum_type = /datum/map_z_level/groundbase
 
-	lobby_screens = list('html/lobby/logo1.gif')
+	lobby_screens = list('html/lobby/logo1.png')
 	id_hud_icons = 'icons/mob/hud_jobs_vr.dmi'
 
 
diff --git a/maps/stellar_delight/stellar_delight_defines.dm b/maps/stellar_delight/stellar_delight_defines.dm
index d6161cf3e2e..612baf025a7 100644
--- a/maps/stellar_delight/stellar_delight_defines.dm
+++ b/maps/stellar_delight/stellar_delight_defines.dm
@@ -1,12 +1,12 @@
 /datum/map/stellar_delight/New()
 	..()
 	var/choice = pickweight(list(
-		'html/lobby/logo1.gif' = 50,
-		'html/lobby/logo2.gif' = 50,
-		'html/lobby/gateway.gif' = 5,
-		'html/lobby/youcanttaketheskyfromme.gif' = 200,
-		'html/lobby/intothedark.gif' = 200,
-		'html/lobby/above3b.gif' = 200,
+		'html/lobby/logo1.png' = 50,
+		'html/lobby/logo2.png' = 50,
+		'html/lobby/gateway.png' = 5,
+		'html/lobby/youcanttaketheskyfromme.png' = 200,
+		'html/lobby/intothedark.png' = 200,
+		'html/lobby/above3b.png' = 200,
 	))
 	if(choice)
 		lobby_screens = list(choice)
@@ -24,7 +24,7 @@
 
 	zlevel_datum_type = /datum/map_z_level/stellar_delight
 
-	lobby_screens = list('html/lobby/youcanttaketheskyfromme.gif') //set back to youcanttaketheskyfromme
+	lobby_screens = list('html/lobby/youcanttaketheskyfromme.png') //set back to youcanttaketheskyfromme
 	id_hud_icons = 'icons/mob/hud_jobs_vr.dmi'
 
 
diff --git a/maps/tether/tether_defines.dm b/maps/tether/tether_defines.dm
index 8126bda18d0..296888296db 100644
--- a/maps/tether/tether_defines.dm
+++ b/maps/tether/tether_defines.dm
@@ -1,16 +1,16 @@
 /datum/map/tether/New()
 	..()
 	var/choice = pickweight(list(
-		'html/lobby/title.gif' = 10,
-		'html/lobby/tether.gif' = 50,
-		'html/lobby/tether_night.gif' = 50,
-		'html/lobby/tether2_night.gif' = 50,
-		'html/lobby/tether2_dog.gif' = 1,
-		'html/lobby/tether2_love.gif' = 1,
-		'html/lobby/tether_future.gif' = 10,
-		'html/lobby/logo1.gif' = 20,
-		'html/lobby/logo2.gif' = 20,
-		'html/lobby/gateway.gif' = 5
+		'html/lobby/title.png' = 10,
+		'html/lobby/tether.png' = 50,
+		'html/lobby/tether_night.png' = 50,
+		'html/lobby/tether2_night.png' = 50,
+		'html/lobby/tether2_dog.png' = 1,
+		'html/lobby/tether2_love.png' = 1,
+		'html/lobby/tether_future.png' = 10,
+		'html/lobby/logo1.png' = 20,
+		'html/lobby/logo2.png' = 20,
+		'html/lobby/gateway.png' = 5
 	))
 	if(choice)
 		lobby_screens = list(choice)
@@ -28,7 +28,7 @@
 
 	zlevel_datum_type = /datum/map_z_level/tether
 
-	lobby_screens = list('html/lobby/tether2_night.gif')
+	lobby_screens = list('html/lobby/tether2_night.png')
 	id_hud_icons = 'icons/mob/hud_jobs_vr.dmi'
 
 	holomap_smoosh = list(list(
diff --git a/maps/virgo_minitest/virgo_minitest_defines.dm b/maps/virgo_minitest/virgo_minitest_defines.dm
index 7fa423a75af..00b384c9693 100644
--- a/maps/virgo_minitest/virgo_minitest_defines.dm
+++ b/maps/virgo_minitest/virgo_minitest_defines.dm
@@ -6,7 +6,7 @@
 	full_name = "NSS Ade-testing"
 	path = "virgo_minitest"
 
-	lobby_screens = list('html/lobby/logo2.gif')
+	lobby_screens = list('html/lobby/logo2.png')
 
 	id_hud_icons = 'icons/mob/hud_jobs_vr.dmi'
 
diff --git a/maps/~map_system/maps.dm b/maps/~map_system/maps.dm
index aaa8e01eefc..6c455b2f648 100644
--- a/maps/~map_system/maps.dm
+++ b/maps/~map_system/maps.dm
@@ -124,7 +124,7 @@ var/list/all_maps = list()
 
 	var/datum/skybox_settings/default_skybox // What skybox do we use if a zlevel doesn't have a custom one? Provide a type.
 
-	var/list/lobby_screens = list('html/lobby/mockingjay00.gif')                 // The list of lobby screen to pick() from. If left unset the first icon state is always selected.
+	var/list/lobby_screens = list('html/lobby/mockingjay00.webp')                 // The list of lobby screen to pick() from. If left unset the first icon state is always selected.
 
 	var/default_law_type = /datum/ai_laws/nanotrasen // The default lawset use by synth units, if not overriden by their laws var.