diff --git a/Assets/llamacasty-icon.ico b/Assets/llamacasty-icon.ico
new file mode 100644
index 0000000..e91de76
Binary files /dev/null and b/Assets/llamacasty-icon.ico differ
diff --git a/Assets/llamacasty-icon.png b/Assets/llamacasty-icon.png
new file mode 100644
index 0000000..2e8ebd5
Binary files /dev/null and b/Assets/llamacasty-icon.png differ
diff --git a/CameraPickerDialog.xaml b/CameraPickerDialog.xaml
index 3ddf3d9..85a8281 100644
--- a/CameraPickerDialog.xaml
+++ b/CameraPickerDialog.xaml
@@ -2,7 +2,7 @@
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         Title="Add Webcam" Height="340" Width="460"
-        Icon="/Assets/tyllive-icon.png"
+        Icon="/Assets/llamacasty-icon.png"
         WindowStartupLocation="CenterOwner" ResizeMode="NoResize"
         ShowInTaskbar="False" Background="#1a1a2e">
 
diff --git a/GoLiveWindow.xaml b/GoLiveWindow.xaml
index a862ce5..d0aecff 100644
--- a/GoLiveWindow.xaml
+++ b/GoLiveWindow.xaml
@@ -2,7 +2,7 @@
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         Title="Start Stream" Height="480" Width="520"
-        Icon="/Assets/tyllive-icon.png"
+        Icon="/Assets/llamacasty-icon.png"
         WindowStartupLocation="CenterOwner" ResizeMode="NoResize"
         ShowInTaskbar="False" Background="#1a1a2e">
 
diff --git a/MainWindow.xaml b/MainWindow.xaml
index c9ed9de..62b54d3 100644
--- a/MainWindow.xaml
+++ b/MainWindow.xaml
@@ -9,7 +9,7 @@
         mc:Ignorable="d"
         Title="{Binding WindowTitle}" Height="720" Width="1280"
         MinWidth="1180" MinHeight="600"
-        Icon="/ytLive;component/Assets/tyllive-icon.png"
+        Icon="/ytLive;component/Assets/llamacasty-icon.png"
         Background="#1a1a2e"
         WindowStartupLocation="CenterScreen"
         Closing="MainWindow_Closing"
diff --git a/MicPickerDialog.xaml b/MicPickerDialog.xaml
index 86ce4fc..aa4ffa1 100644
--- a/MicPickerDialog.xaml
+++ b/MicPickerDialog.xaml
@@ -2,7 +2,7 @@
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         Title="Select Microphone" Height="340" Width="460"
-        Icon="/Assets/tyllive-icon.png"
+        Icon="/Assets/llamacasty-icon.png"
         WindowStartupLocation="CenterOwner" ResizeMode="NoResize"
         ShowInTaskbar="False" Background="#1a1a2e">
 
diff --git a/Models/Source.cs b/Models/Source.cs
index 8eacf7f..743b994 100644
--- a/Models/Source.cs
+++ b/Models/Source.cs
@@ -11,7 +11,8 @@ public enum SourceType
     Image,
     TextOverlay,
     Countdown,
-    WebSource
+    WebSource,
+    ChatBox
 }
 
 public enum ClipShape
@@ -105,4 +106,39 @@ public class Source : SceneElement
     // Web source config
     private string? _webUri;
     public string? WebUri { get => _webUri; set => Set(ref _webUri, value); }
+
+    // Chat box config (TASK 3.18)
+    private double _chatFontSize = 16;
+    public double ChatFontSize
+    {
+        get => _chatFontSize;
+        set => Set(ref _chatFontSize, Math.Clamp(value, 8, 72));
+    }
+
+    private string _chatFontColor = "#FFFFFF";
+    public string ChatFontColor { get => _chatFontColor; set => Set(ref _chatFontColor, value); }
+
+    private string _chatBackgroundColor = "#80000000";
+    public string ChatBackgroundColor { get => _chatBackgroundColor; set => Set(ref _chatBackgroundColor, value); }
+
+    private int _chatMaxMessages = 5;
+    public int ChatMaxMessages
+    {
+        get => _chatMaxMessages;
+        set => Set(ref _chatMaxMessages, Math.Clamp(value, 1, 20));
+    }
+
+    private bool _chatShowTimestamps = true;
+    public bool ChatShowTimestamps { get => _chatShowTimestamps; set => Set(ref _chatShowTimestamps, value); }
+
+    private bool _chatShowBadges = true;
+    public bool ChatShowBadges { get => _chatShowBadges; set => Set(ref _chatShowBadges, value); }
+
+    private string _chatMemberColor = "#e94560";
+    public string ChatMemberColor { get => _chatMemberColor; set => Set(ref _chatMemberColor, value); }
+
+    private string _chatSuperChatColor = "#eab308";
+    public string ChatSuperChatColor { get => _chatSuperChatColor; set => Set(ref _chatSuperChatColor, value); }
+
+    public bool IsChatBox => Type == SourceType.ChatBox;
 }
diff --git a/ReuseImageDialog.xaml b/ReuseImageDialog.xaml
index 72096a7..b9a7f9a 100644
--- a/ReuseImageDialog.xaml
+++ b/ReuseImageDialog.xaml
@@ -2,7 +2,7 @@
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         Title="Add Image" Height="380" Width="460"
-        Icon="/Assets/tyllive-icon.png"
+        Icon="/Assets/llamacasty-icon.png"
         WindowStartupLocation="CenterOwner" ResizeMode="NoResize"
         ShowInTaskbar="False" Background="#1a1a2e">
 
diff --git a/SocialsDialog.xaml b/SocialsDialog.xaml
index 60f90eb..658ec22 100644
--- a/SocialsDialog.xaml
+++ b/SocialsDialog.xaml
@@ -2,7 +2,7 @@
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         Title="Social Media Site Promotion" Height="520" Width="520"
-        Icon="/Assets/tyllive-icon.png"
+        Icon="/Assets/llamacasty-icon.png"
         WindowStartupLocation="CenterOwner" ResizeMode="NoResize"
         ShowInTaskbar="False" Background="#1a1a2e">
 
diff --git a/ytLive.csproj b/ytLive.csproj
index 9647a3d..9c5f58d 100644
--- a/ytLive.csproj
+++ b/ytLive.csproj
@@ -7,7 +7,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <UseWPF>true</UseWPF>
     <EnableWindowsTargeting>true</EnableWindowsTargeting>
-    <ApplicationIcon>Assets\tyllive-icon.ico</ApplicationIcon>
+    <ApplicationIcon>Assets\llamacasty-icon.ico</ApplicationIcon>
     <AssemblyName>ytLive</AssemblyName>
     <RootNamespace>ytLive</RootNamespace>
   </PropertyGroup>
@@ -20,7 +20,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Resource Include="Assets\tyllive-icon.png"/>
+    <Resource Include="Assets\llamacasty-icon.png"/>
+    <Resource Include="Assets\llamacasty-logo.jpg"/>
     <Resource Include="Assets\ytLlive-logo.png"/>
   </ItemGroup>