diff --git a/code/game/machinery/computer/teleporter.dm b/code/game/machinery/computer/teleporter.dm
index f4f20aecc9..b5869ef36b 100644
--- a/code/game/machinery/computer/teleporter.dm
+++ b/code/game/machinery/computer/teleporter.dm
@@ -90,6 +90,7 @@
 		say("Processing hub calibration to target...")
 
 		calibrating = 1
+		power_station.update_icon()
 		spawn(50 * (3 - power_station.teleporter_hub.accurate)) //Better parts mean faster calibration
 			calibrating = 0
 			if(check_hub_connection())
@@ -97,6 +98,7 @@
 				say("Calibration complete.")
 			else
 				say("Error: Unable to detect hub.")
+			power_station.update_icon()
 			updateDialog()
 
 	updateDialog()
diff --git a/code/game/machinery/teleporter.dm b/code/game/machinery/teleporter.dm
index 1f1f13ee22..ae71a0b844 100644
--- a/code/game/machinery/teleporter.dm
+++ b/code/game/machinery/teleporter.dm
@@ -209,5 +209,7 @@
 		icon_state = "controller-o"
 	else if(stat & (BROKEN|NOPOWER))
 		icon_state = "controller-p"
+	else if(teleporter_console && teleporter_console.calibrating)
+		icon_state = "controller-c"
 	else
 		icon_state = "controller"
diff --git a/icons/obj/machines/teleporter.dmi b/icons/obj/machines/teleporter.dmi
index 1d3c97199b..08c014af8f 100644
Binary files a/icons/obj/machines/teleporter.dmi and b/icons/obj/machines/teleporter.dmi differ