diff --git a/code/controllers/subsystems/ping.dm b/code/controllers/subsystems/ping.dm
index e8e34f383b..a41bc383b5 100644
--- a/code/controllers/subsystems/ping.dm
+++ b/code/controllers/subsystems/ping.dm
@@ -27,6 +27,10 @@ SUBSYSTEM_DEF(ping)
 		var/client/client = currentrun[currentrun.len]
 		currentrun.len--
 
+		if(!client.is_preference_enabled(/datum/client_preference/vchat_enable))
+			winset(client, "output", "on-show=&is-disabled=0&is-visible=1")
+			winset(client, "browseroutput", "is-disabled=1;is-visible=0")
+
 		if (client?.tgui_panel?.is_ready())
 			// Send a soft ping
 			client.tgui_panel.window.send_message("ping/soft", list(
diff --git a/code/modules/client/preference_setup/global/setting_datums.dm b/code/modules/client/preference_setup/global/setting_datums.dm
index 21f8037506..fd1ebc2ebc 100644
--- a/code/modules/client/preference_setup/global/setting_datums.dm
+++ b/code/modules/client/preference_setup/global/setting_datums.dm
@@ -289,7 +289,7 @@ var/list/_client_preferences_by_type
 	key = "SOUND_INSTRUMENT"
 
 /datum/client_preference/vchat_enable
-	description = "Enable/Disable VChat"
+	description = "Enable/Disable TGChat"
 	key = "VCHAT_ENABLE"
 	enabled_description =  "Enabled"
 	disabled_description = "Disabled"
diff --git a/code/modules/client/preferences_toggle_procs.dm b/code/modules/client/preferences_toggle_procs.dm
index 454a5ec6ac..8ce75698ba 100644
--- a/code/modules/client/preferences_toggle_procs.dm
+++ b/code/modules/client/preferences_toggle_procs.dm
@@ -367,17 +367,17 @@
 	feedback_add_details("admin_verb","THInstm") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
 /client/verb/toggle_vchat()
-	set name = "Toggle VChat"
+	set name = "Toggle TGChat"
 	set category = "Preferences"
-	set desc = "Toggles VChat. Reloading VChat and/or reconnecting required to affect changes."
+	set desc = "Toggles TGChat. Reloading TGChat and/or reconnecting required to affect changes."
 
 	var/pref_path = /datum/client_preference/vchat_enable
 	toggle_preference(pref_path)
 	SScharacter_setup.queue_preferences_save(prefs)
 
-	to_chat(src, "You have toggled VChat [is_preference_enabled(pref_path) ? "on" : "off"]. \
-		You will have to reload VChat and/or reconnect to the server for these changes to take place. \
-		VChat message persistence is not guaranteed if you change this again before the start of the next round.")
+	to_chat(src, "You have toggled TGChat [is_preference_enabled(pref_path) ? "on" : "off"]. \
+		You will have to reload TGChat and/or reconnect to the server for these changes to take place. \
+		TGChat message persistence is not guaranteed if you change this again before the start of the next round.")
 
 /client/verb/toggle_tgui_inputlock()
 	set name = "Toggle TGUI Input Lock"
diff --git a/code/modules/tgchat/_legacy.dm b/code/modules/tgchat/_legacy.dm
index f5791a8a27..fe01936540 100644
--- a/code/modules/tgchat/_legacy.dm
+++ b/code/modules/tgchat/_legacy.dm
@@ -1,5 +1,6 @@
 /// Old VChat Code Stuff
 
+/* Old bicon code
 /proc/expire_bicon_cache(key)
 	if(GLOB.bicon_cache[key])
 		GLOB.bicon_cache -= key
@@ -7,9 +8,12 @@
 	return FALSE
 
 GLOBAL_LIST_EMPTY(bicon_cache) // Cache of the <img> tag results, not the icons
+*/
+
 /proc/bicon(var/obj, var/use_class = 1, var/custom_classes = "")
 	return icon2base64html(obj, custom_classes)
 
+	/* Old bicon code
 	var/class = use_class ? "class='icon misc [custom_classes]'" : null
 	if(!obj)
 		return
@@ -41,3 +45,4 @@ GLOBAL_LIST_EMPTY(bicon_cache) // Cache of the <img> tag results, not the icons
 		class = "class='icon [A.icon_state] [custom_classes]'"
 
 	return "<IMG [class] src='data:image/png;base64,[base64]'>"
+	*/