diff --git a/code/modules/power/solar.dm b/code/modules/power/solar.dm
index af81b632d7..f0085d1c5f 100644
--- a/code/modules/power/solar.dm
+++ b/code/modules/power/solar.dm
@@ -345,9 +345,6 @@
 		add_overlay("[icon_state]_broken")
 	else
 		add_overlay(icon_screen)
-	if(currentdir > -1)
-		setDir(angle2dir(currentdir))
-		add_overlay(mutable_appearance(icon, "solcon-o", FLY_LAYER))
 
 /obj/machinery/power/solar_control/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, \
 												datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
@@ -375,7 +372,7 @@
 	if(..())
 		return
 	switch(action)
-		if("direction")
+		if("angle")
 			var/adjust = text2num(params["adjust"])
 			if(adjust)
 				currentdir = CLAMP((360 + adjust + currentdir) % 360, 0, 359)
@@ -391,9 +388,7 @@
 				. = TRUE
 		if("tracking")
 			var/mode = text2num(params["mode"])
-			if(mode)
-				track = mode
-				. = TRUE
+			track = mode
 			if(mode == 2 && connected_tracker)
 				connected_tracker.set_angle(SSsun.angle)
 				set_panels(currentdir)
@@ -402,6 +397,7 @@
 				if(trackrate)
 					nexttime = world.time + 36000 / abs(trackrate)
 				set_panels(targetdir)
+			. = TRUE
 		if("refresh")
 			search_for_connected()
 			if(connected_tracker && track == 2)
diff --git a/icons/obj/computer.dmi b/icons/obj/computer.dmi
index d4d9d01069..fb1ae63b4e 100644
Binary files a/icons/obj/computer.dmi and b/icons/obj/computer.dmi differ