diff --git a/1.6/1.6/Assemblies/WulaFallenEmpire.dll b/1.6/1.6/Assemblies/WulaFallenEmpire.dll
index da3f51a3..f16137ea 100644
Binary files a/1.6/1.6/Assemblies/WulaFallenEmpire.dll and b/1.6/1.6/Assemblies/WulaFallenEmpire.dll differ
diff --git a/Source/WulaFallenEmpire/EventSystem/AI/AIIntelligenceCore.cs b/Source/WulaFallenEmpire/EventSystem/AI/AIIntelligenceCore.cs
index 9a8cfce1..ef55a9e6 100644
--- a/Source/WulaFallenEmpire/EventSystem/AI/AIIntelligenceCore.cs
+++ b/Source/WulaFallenEmpire/EventSystem/AI/AIIntelligenceCore.cs
@@ -1145,6 +1145,10 @@ You are 'The Legion', a super AI of the Wula Empire. Your personality is authori
             for (int i = 0; i < _history.Count; i++)
             {
                 var entry = _history[i];
+                if (string.Equals(entry.role, "toolcall", StringComparison.OrdinalIgnoreCase))
+                {
+                    continue;
+                }
                 if (string.Equals(entry.role, "tool", StringComparison.OrdinalIgnoreCase))
                 {
                     if (lastUserIndex != -1 && i > lastUserIndex)
@@ -1160,8 +1164,12 @@ You are 'The Legion', a super AI of the Wula Empire. Your personality is authori
                     continue;
                 }
 
-                // Revert UI filtering: Add assistant messages directly without stripping tool call JSON for history context
-                filtered.Add(entry);
+                string cleaned = StripToolCallJson(entry.message)?.Trim() ?? "";
+                if (string.IsNullOrWhiteSpace(cleaned))
+                {
+                    continue;
+                }
+                filtered.Add((entry.role, cleaned));
             }
 
             return filtered;
diff --git a/Source/WulaFallenEmpire/EventSystem/AI/UI/Dialog_AIConversation.cs b/Source/WulaFallenEmpire/EventSystem/AI/UI/Dialog_AIConversation.cs
index 86f8fe80..1be91c29 100644
--- a/Source/WulaFallenEmpire/EventSystem/AI/UI/Dialog_AIConversation.cs
+++ b/Source/WulaFallenEmpire/EventSystem/AI/UI/Dialog_AIConversation.cs
@@ -627,10 +627,6 @@ namespace WulaFallenEmpire.EventSystem.AI.UI
 
             float padding = 8f;
             Rect headerRect = new Rect(rect.x, rect.y, rect.width, traceEntry.traceHeaderHeight);
-            GUI.color = new Color(0.15f, 0.15f, 0.15f, 0.8f);
-            Widgets.DrawBoxSolid(headerRect, GUI.color);
-            GUI.color = Color.white;
-
             Text.Font = GameFont.Tiny;
             Text.Anchor = TextAnchor.MiddleLeft;
             string headerLine = $"{(traceEntry.traceExpanded ? "v" : ">")} {traceEntry.traceHeader}";
@@ -646,11 +642,6 @@ namespace WulaFallenEmpire.EventSystem.AI.UI
 
             if (traceEntry.traceExpanded && traceEntry.traceLines != null && traceEntry.traceLines.Count > 0)
             {
-                Rect bodyRect = new Rect(rect.x, headerRect.yMax, rect.width, rect.height - traceEntry.traceHeaderHeight);
-                GUI.color = new Color(0.12f, 0.12f, 0.12f, 0.45f);
-                Widgets.DrawBoxSolid(bodyRect, GUI.color);
-                GUI.color = Color.white;
-
                 float y = headerRect.yMax + 6f;
                 foreach (string line in traceEntry.traceLines)
                 {
diff --git a/Source/WulaFallenEmpire/EventSystem/AI/UI/Overlay_WulaLink.cs b/Source/WulaFallenEmpire/EventSystem/AI/UI/Overlay_WulaLink.cs
index 75f74016..67208dc3 100644
--- a/Source/WulaFallenEmpire/EventSystem/AI/UI/Overlay_WulaLink.cs
+++ b/Source/WulaFallenEmpire/EventSystem/AI/UI/Overlay_WulaLink.cs
@@ -673,10 +673,6 @@ namespace WulaFallenEmpire.EventSystem.AI.UI
 
             float padding = 8f;
             Rect headerRect = new Rect(rect.x, rect.y, rect.width, traceEntry.traceHeaderHeight);
-            GUI.color = new Color(0.12f, 0.12f, 0.12f, 0.8f);
-            Widgets.DrawBoxSolid(headerRect, GUI.color);
-            GUI.color = Color.white;
-
             Text.Font = GameFont.Tiny;
             Text.Anchor = TextAnchor.MiddleLeft;
             string headerLine = $"{(traceEntry.traceExpanded ? "v" : ">")} {traceEntry.traceHeader}";
@@ -692,11 +688,6 @@ namespace WulaFallenEmpire.EventSystem.AI.UI
 
             if (traceEntry.traceExpanded && traceEntry.traceLines != null && traceEntry.traceLines.Count > 0)
             {
-                Rect bodyRect = new Rect(rect.x, headerRect.yMax, rect.width, rect.height - traceEntry.traceHeaderHeight);
-                GUI.color = new Color(0.1f, 0.1f, 0.1f, 0.45f);
-                Widgets.DrawBoxSolid(bodyRect, GUI.color);
-                GUI.color = Color.white;
-
                 float y = headerRect.yMax + 6f;
                 foreach (string line in traceEntry.traceLines)
                 {