diff --git a/code/modules/lighting/lighting_fake_sun_vr.dm b/code/modules/lighting/lighting_fake_sun_vr.dm
index fd315aa530..8f1d68a6f7 100644
--- a/code/modules/lighting/lighting_fake_sun_vr.dm
+++ b/code/modules/lighting/lighting_fake_sun_vr.dm
@@ -109,13 +109,11 @@
 
 	sun = new(null)
 
-	sun.color = choice["color"]
-	sun.alpha = round(CLAMP01(choice["brightness"])*255,1)
+	sun.set_color(choice["color"])
+	sun.set_alpha(round(CLAMP01(choice["brightness"])*255,1))
 
 	for(var/turf/T as anything in turfs_to_use)
-		T.vis_contents += sun
-		T.dynamic_lumcount = 0.5 // Cheap hack
-		T.set_luminosity(1, TRUE)
+		sun.apply_to_turf(T)
 
 /obj/effect/fake_sun/warm
 	name = "warm fake sun"
diff --git a/code/modules/planet/sun.dm b/code/modules/planet/sun.dm
index 52172d4d5a..91d095172c 100644
--- a/code/modules/planet/sun.dm
+++ b/code/modules/planet/sun.dm
@@ -1,11 +1,12 @@
 /datum/sun_holder
-	var/atom/movable/sun_visuals/sun = new
+	var/atom/movable/sun_visuals/sun
 	var/datum/planet/our_planet
 
 	var/our_color = "#FFFFFF"
 	var/our_brightness = 1.0
 
 /datum/sun_holder/New(var/source)
+	sun = new(null)
 	our_planet = source
 
 /datum/sun_holder/proc/update_color(new_color)
@@ -14,7 +15,8 @@
 		return
 	
 	// Visible change
-	sun.color = our_color = new_color
+	our_color = new_color
+	sun.set_color(new_color)
 
 /datum/sun_holder/proc/update_brightness(new_brightness, list/turfs)
 	// Doesn't save much work, but might save a smidge of client work
@@ -26,7 +28,7 @@
 	our_brightness = new_brightness
 	
 	// Visible change
-	sun.alpha = round(CLAMP01(our_brightness)*255,1)
+	sun.set_alpha(round(CLAMP01(our_brightness)*255,1))
 	
 	// Update dynamic lumcount so darksight and stuff works
 	var/difference = . - our_brightness
@@ -37,17 +39,13 @@
 	if(sun in T.vis_contents)
 		warning("Was asked to add fake sun to [T.x], [T.y], [T.z] despite already having us in it's vis contents")
 		return
-	T.vis_contents += sun
-	T.dynamic_lumcount += our_brightness
-	T.set_luminosity(1, TRUE)
+	sun.apply_to_turf(T)
 
 /datum/sun_holder/proc/remove_from_turf(turf/T)
 	if(!(sun in T.vis_contents))
 		warning("Was asked to remove fake sun from [T.x], [T.y], [T.z] despite it not having us in it's vis contents")
 		return
-	T.vis_contents -= sun
-	T.dynamic_lumcount -= our_brightness
-	T.set_luminosity(!IS_DYNAMIC_LIGHTING(T), TRUE)
+	sun.remove_from_turf(T)
 
 /datum/sun_holder/proc/rainbow()
 	var/end = world.time + 30 SECONDS
@@ -71,9 +69,119 @@
 
 // Holds a full white icon that can be mutated to make sun on the O_LIGHTING plane
 /atom/movable/sun_visuals
-	icon = 'icons/mob/screen_gen.dmi'
-	icon_state = "flash"
+	icon = 'icons/effects/effects.dmi'
+	icon_state = "white"
 	plane = PLANE_O_LIGHTING_VISUAL
 	mouse_opacity = 0
 	alpha = 0
 	color = "#FFFFFF"
+	
+	var/turfs_providing_spreads = list()
+	var/turfs_receiving_spreads = list()
+	var/spreads = list()
+
+/atom/movable/sun_visuals/New()
+	..()
+	spreads["1"] = new /atom/movable/sun_visuals_overlap(src, NORTH, "white_gradient")
+	spreads["2"] = new /atom/movable/sun_visuals_overlap(src, SOUTH, "white_gradient")
+	spreads["4"] = new /atom/movable/sun_visuals_overlap(src, EAST, "white_gradient")
+	spreads["8"] = new /atom/movable/sun_visuals_overlap(src, WEST, "white_gradient")
+
+	spreads["i5"] = new /atom/movable/sun_visuals_overlap(src, NORTHEAST, "white_inner")
+	spreads["i6"] = new /atom/movable/sun_visuals_overlap(src, SOUTHEAST, "white_inner")
+	spreads["i9"] = new /atom/movable/sun_visuals_overlap(src, NORTHWEST, "white_inner")
+	spreads["i10"] = new /atom/movable/sun_visuals_overlap(src, SOUTHWEST, "white_inner")
+
+	spreads["o5"] = new /atom/movable/sun_visuals_overlap(src, NORTHEAST, "white_outer")
+	spreads["o6"] = new /atom/movable/sun_visuals_overlap(src, SOUTHEAST, "white_outer")
+	spreads["o9"] = new /atom/movable/sun_visuals_overlap(src, NORTHWEST, "white_outer")
+	spreads["o10"] = new /atom/movable/sun_visuals_overlap(src, SOUTHWEST, "white_outer")
+
+/atom/movable/sun_visuals/proc/set_color(new_color)
+	src.color = new_color
+	for(var/key in spreads)
+		var/atom/movable/sun_visuals_overlap/SVO = spreads[key]
+		SVO.color = new_color
+
+/atom/movable/sun_visuals/proc/set_alpha(new_alpha)
+	src.alpha = new_alpha
+	for(var/key in spreads)
+		var/atom/movable/sun_visuals_overlap/SVO = spreads[key]
+		SVO.alpha = new_alpha
+
+/atom/movable/sun_visuals/proc/apply_to_turf(var/turf/T)
+	T.vis_contents += src
+	T.dynamic_lumcount += 0.5
+	T.set_luminosity(1, TRUE)
+	
+	var/list/localspreads
+	// Test for corners
+	for(var/direction in cornerdirs)
+		var/turf/dirturf = get_step(T, direction)
+		if(dirturf && !dirturf.outdoors)
+			var/turf/TL = get_step(T, turn(direction, -45))
+			var/turf/TR = get_step(T, turn(direction, 45))
+			
+			// If outdoors at 45 degrees are the same, then this is a corner
+			if(TL && TR && TL.outdoors == TR.outdoors)
+				var/atom/movable/sun_visuals_overlap/OL
+				// Outer corner
+				if(TL.outdoors)
+					OL = spreads["o[direction]"]
+				// Inner corner
+				else
+					OL = spreads["i[direction]"]
+				T.vis_contents += OL
+				LAZYADD(localspreads, OL)
+				LAZYADD(turfs_receiving_spreads[dirturf], OL)
+				dirturf.set_luminosity(1)
+	
+	// Take all orthagonals
+	for(var/direction in cardinal)
+		var/turf/dirturf = get_step(T, direction)
+		if(dirturf && !dirturf.outdoors)
+			var/turf/TL = get_step(T, turn(direction, -45))
+			var/turf/TR = get_step(T, turn(direction, 45))
+			// End of a wall, the corner will handle it
+			if(TL && TR && TL.outdoors != TR.outdoors)
+				continue
+			var/atom/movable/sun_visuals_overlap/OL = spreads["[direction]"]
+			T.vis_contents += OL
+			LAZYADD(localspreads, OL)
+			LAZYADD(turfs_receiving_spreads[dirturf], OL)
+			dirturf.set_luminosity(1)
+
+	if(LAZYLEN(localspreads))
+		turfs_providing_spreads[T] = localspreads
+
+/atom/movable/sun_visuals/proc/remove_from_turf(var/turf/T)
+	T.vis_contents -= src
+	T.dynamic_lumcount -= 0.5
+	T.set_luminosity(!IS_DYNAMIC_LIGHTING(T), TRUE)
+	var/list/applied = turfs_providing_spreads[T]
+	if(LAZYLEN(applied))
+		T.vis_contents -= applied
+		turfs_providing_spreads -= T
+		applied.Cut()
+
+/atom/movable/sun_visuals_overlap
+	icon = 'icons/effects/effects.dmi'
+	icon_state = null
+	plane = PLANE_O_LIGHTING_VISUAL
+	mouse_opacity = 0
+	alpha = 0
+	color = "#FFFFFF"
+
+/atom/movable/sun_visuals_overlap/New(newloc, newdir, newstate)
+	..()
+	icon_state = newstate
+	dir = newdir
+	if(newdir & NORTH)
+		pixel_y = 32
+	else if(newdir & SOUTH)
+		pixel_y = -32
+
+	if(newdir & EAST)
+		pixel_x = 32
+	else if(newdir & WEST)
+		pixel_x = -32
diff --git a/code/modules/planet/virgo3b_vr.dm b/code/modules/planet/virgo3b_vr.dm
index 2700b69805..ea441b6f38 100644
--- a/code/modules/planet/virgo3b_vr.dm
+++ b/code/modules/planet/virgo3b_vr.dm
@@ -93,8 +93,7 @@ var/datum/planet/virgo3b/planet_virgo3b = null
 
 		new_color = rgb(new_r, new_g, new_b)
 
-	spawn(1)
-		update_sun_deferred(new_brightness, new_color)
+	update_sun_deferred(new_brightness, new_color)
 
 
 /datum/weather_holder/virgo3b
diff --git a/icons/effects/effects.dmi b/icons/effects/effects.dmi
index 8c74dc49b5..f71ea2a829 100644
Binary files a/icons/effects/effects.dmi and b/icons/effects/effects.dmi differ