diff --git a/Content.Server/Objectives/Systems/StealConditionSystem.cs b/Content.Server/Objectives/Systems/StealConditionSystem.cs
index 9cd7fdab34..d877f61ef6 100644
--- a/Content.Server/Objectives/Systems/StealConditionSystem.cs
+++ b/Content.Server/Objectives/Systems/StealConditionSystem.cs
@@ -79,8 +79,8 @@ public sealed class StealConditionSystem : EntitySystem
         var locale = $"objective-{Regex.Replace(group.Name, @"[*?!'%\s]", string.Empty).ToLower()}";
         if (Loc.GetString(locale) == locale)
         {
-            Logger.Error($"Steal item {locale} doesn't have locale");
-            var locale = group.Name;
+            Logger.Error($"Steal item objective-{Regex.Replace(group.Name, @"[*?!'%\s]", string.Empty).ToLower()} doesn't have locale");
+            locale = group.Name;
         }
         var title =condition.Comp.OwnerText == null
             ? Loc.GetString(condition.Comp.ObjectiveNoOwnerText, ("itemName", Loc.GetString(locale)))
diff --git a/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml b/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml
index e627cffc74..4399aa7757 100644
--- a/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml
+++ b/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml
@@ -4,7 +4,7 @@
   categories: [ HideSpawnMenu ]
   components:
   - type: ShowJobIcons
-  - type: ShowMindShieldIcons
+#  - type: ShowMindShieldIcons Sunrise-Edit
   - type: ShowCriminalRecordIcons
 
 - type: entity
diff --git a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
index 54daa5b54f..2bd8c9136b 100644
--- a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
+++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
@@ -314,7 +314,7 @@
   - type: AccessReader
     access: [["Command"], ["Research"]]
   - type: ShowJobIcons
-  - type: ShowMindShieldIcons
+#  - type: ShowMindShieldIcons Sunrise-Edit
   - type: BorgCrewManifestViewer # Sunrise-Edit
 
 
@@ -354,7 +354,7 @@
     radius: 6
     energy: 3
   - type: ShowJobIcons
-  - type: ShowMindShieldIcons
+#  - type: ShowMindShieldIcons Sunrise-Edit
   - type: ShowCriminalRecordIcons
   - type: MobThresholds
     thresholds:
diff --git a/Resources/Prototypes/_Sunrise/Entities/Clothing/Eyes/glasses.yml b/Resources/Prototypes/_Sunrise/Entities/Clothing/Eyes/glasses.yml
index 804436a8bb..e01837bf5e 100644
--- a/Resources/Prototypes/_Sunrise/Entities/Clothing/Eyes/glasses.yml
+++ b/Resources/Prototypes/_Sunrise/Entities/Clothing/Eyes/glasses.yml
@@ -32,7 +32,7 @@
     sprite: _Sunrise/Clothing/Eyes/Glasses/blueshield_sunglasses.rsi
   - type: FlashImmunity
   - type: ShowJobIcons
-  - type: ShowMindShieldIcons
+#  - type: ShowMindShieldIcons
   - type: ShowCriminalRecordIcons
   - type: ShowHealthBars
     damageContainers:
@@ -75,7 +75,7 @@
     sprite: _Sunrise/Clothing/Eyes/Glasses/sunhudskill.rsi
   - type: FlashImmunity
   - type: ShowJobIcons
-  - type: ShowMindShieldIcons
+#  - type: ShowMindShieldIcons
   - type: ShowCriminalRecordIcons
   - type: Tag
     tags: