diff --git a/MainWindow.xaml b/MainWindow.xaml
index 8d4fb81..772565b 100644
--- a/MainWindow.xaml
+++ b/MainWindow.xaml
@@ -121,14 +121,36 @@
 
                 <!-- Stream Controls -->
                 <StackPanel Grid.Column="3" Orientation="Horizontal" VerticalAlignment="Center">
-                    <Button Content="▶ GO LIVE" Style="{StaticResource YtButton}"
+
+                    <!-- YouTube connection status light + button -->
+                    <Border Background="#0f3460" CornerRadius="4" Padding="8,6" Margin="0,0,12,0"
+                            VerticalAlignment="Center" ToolTip="YouTube connection status">
+                        <StackPanel Orientation="Horizontal">
+                            <Ellipse Width="10" Height="10" Margin="0,0,8,0" VerticalAlignment="Center">
+                                <Ellipse.Style>
+                                    <Style TargetType="Ellipse">
+                                        <Setter Property="Fill" Value="#555"/>
+                                        <Style.Triggers>
+                                            <DataTrigger Binding="{Binding IsYouTubeConnected}" Value="True">
+                                                <Setter Property="Fill" Value="#00ff00"/>
+                                            </DataTrigger>
+                                        </Style.Triggers>
+                                    </Style>
+                                </Ellipse.Style>
+                            </Ellipse>
+                            <Button Content="YouTube" Style="{StaticResource YtButtonSecondary}"
+                                    Background="Transparent" Padding="0"
+                                    Command="{Binding ConnectYouTubeCommand}"
+                                    ToolTip="Sign in to YouTube (optional)"/>
+                        </StackPanel>
+                    </Border>
+
+                    <Button Content="Go Live" Style="{StaticResource YtButton}"
                             Command="{Binding StartStreamCommand}"
-                            Visibility="{Binding StreamStatus, Converter={StaticResource BoolToVis},
-                                      ConverterParameter=Offline}"/>
-                    <Button Content="■ STOP" Style="{StaticResource YtButton}"
-                            Background="#333" Command="{Binding StopStreamCommand}"/>
-                    <Button Content="YouTube" Style="{StaticResource YtButtonSecondary}"
-                            Command="{Binding ConnectYouTubeCommand}" Margin="8,0,0,0"/>
+                            Visibility="{Binding IsOffline, Converter={StaticResource BoolToVis}}"/>
+                    <Button Content="Stop Stream" Style="{StaticResource YtButton}"
+                            Background="#333" Command="{Binding StopStreamCommand}"
+                            Visibility="{Binding IsLive, Converter={StaticResource BoolToVis}}"/>
                 </StackPanel>
             </Grid>
         </Border>
diff --git a/ViewModels/MainViewModel.cs b/ViewModels/MainViewModel.cs
index d92ca14..ed7061c 100644
--- a/ViewModels/MainViewModel.cs
+++ b/ViewModels/MainViewModel.cs
@@ -31,9 +31,20 @@ public class MainViewModel : ViewModelBase
     public StreamStatus StreamStatus
     {
         get => _streamStatus;
-        set => SetProperty(ref _streamStatus, value);
+        set
+        {
+            if (SetProperty(ref _streamStatus, value))
+            {
+                OnPropertyChanged(nameof(IsOffline));
+                OnPropertyChanged(nameof(IsLive));
+                OnPropertyChanged(nameof(StatusDisplay));
+            }
+        }
     }
 
+    public bool IsOffline => StreamStatus == StreamStatus.Offline;
+    public bool IsLive => StreamStatus == StreamStatus.Streaming;
+
     public StreamHealth CurrentHealth
     {
         get => _currentHealth;