diff --git a/Content.Client/Options/UI/Tabs/ExtraTab.xaml b/Content.Client/Options/UI/Tabs/ExtraTab.xaml
index 0113e528d6..1129eafda4 100644
--- a/Content.Client/Options/UI/Tabs/ExtraTab.xaml
+++ b/Content.Client/Options/UI/Tabs/ExtraTab.xaml
@@ -40,7 +40,7 @@
-
+
diff --git a/Content.Client/Options/UI/Tabs/ExtraTab.xaml.cs b/Content.Client/Options/UI/Tabs/ExtraTab.xaml.cs
index 40a3a29de9..758bf2d80d 100644
--- a/Content.Client/Options/UI/Tabs/ExtraTab.xaml.cs
+++ b/Content.Client/Options/UI/Tabs/ExtraTab.xaml.cs
@@ -99,7 +99,7 @@ public sealed partial class ExtraTab : Control
Control.AddOptionCheckBox(SunriseCCVars.DamageOverlaySelf, DamageOverlaySelfCheckBox);
Control.AddOptionCheckBox(SunriseCCVars.DamageOverlayStructures, DamageOverlayStructuresCheckBox);
- Control.AddOptionCheckBox(SunriseCCVars.ChatIconsEnable, ChatIconsEnableCheckBox);
+ // Control.AddOptionCheckBox(SunriseCCVars.ChatIconsEnable, ChatIconsEnableCheckBox);
Control.AddOptionCheckBox(SunriseCCVars.ChatPointingVisuals, ChatPointingVisualsEnableCheckBox);
Control.Initialize();
diff --git a/Content.Client/_Sunrise/ChatIcons/RadioIconsSystem.cs b/Content.Client/_Sunrise/ChatIcons/RadioIconsSystem.cs
index 3ea44b18cf..f3bcbf53de 100644
--- a/Content.Client/_Sunrise/ChatIcons/RadioIconsSystem.cs
+++ b/Content.Client/_Sunrise/ChatIcons/RadioIconsSystem.cs
@@ -2,6 +2,7 @@
using Content.Shared._Sunrise.SunriseCCVars;
using Robust.Client.UserInterface;
using Robust.Shared.Configuration;
+using Robust.Shared.Configuration;
namespace Content.Client._Sunrise.ChatIcons;
@@ -14,6 +15,7 @@ public sealed class ChatIconsSystem : EntitySystem
{
base.Initialize();
+ _cfg.SetCVar("chat_icon.enable", false, true); // Sunrise TEMP FIX REMOVE
_cfg.OnValueChanged(SunriseCCVars.ChatIconsEnable, OnRadioIconsChanged, true);
}
diff --git a/Content.Shared/_Sunrise/SunriseCCVars/SunriseCCVars.cs b/Content.Shared/_Sunrise/SunriseCCVars/SunriseCCVars.cs
index c3c9b4be38..792af372b1 100644
--- a/Content.Shared/_Sunrise/SunriseCCVars/SunriseCCVars.cs
+++ b/Content.Shared/_Sunrise/SunriseCCVars/SunriseCCVars.cs
@@ -432,7 +432,7 @@ public sealed partial class SunriseCCVars : CVars
*/
public static readonly CVarDef ChatIconsEnable =
- CVarDef.Create("chat_icon.enable", true, CVar.CLIENTONLY | CVar.ARCHIVE);
+ CVarDef.Create("chat_icon.enable", false, CVar.CLIENTONLY | CVar.ARCHIVE);
/*
* Pointing chat visuals