diff --git a/App.xaml.cs b/App.xaml.cs
index 51a039ebb..19e1aaac3 100644
--- a/App.xaml.cs
+++ b/App.xaml.cs
@@ -48,6 +48,10 @@ protected override void OnStartup(StartupEventArgs e)
         // smoke test validate that the vector ResourceDictionary is packaged.
         InstallArvrelMiniIedFascia();
 
+        // Install workstation templates before StartupUri creates its first visual
+        // tree. No theme/style dictionary should be injected on window activation.
+        P2IndustrialWorkstationUx.PreloadResources();
+
         if (Array.Exists(e.Args, argument =>
                 string.Equals(argument, "--portable-smoke-test", StringComparison.OrdinalIgnoreCase)))
         {
@@ -55,6 +59,11 @@ protected override void OnStartup(StartupEventArgs e)
             return;
         }
 
+        // Loaded runs before the initial ContentRendered frame. Apply the
+        // legacy-only chrome once per real window, not on every focus change.
+        EventManager.RegisterClassHandler(typeof(Window), FrameworkElement.LoadedEvent,
+            new RoutedEventHandler(AppWindow_Loaded), handledEventsToo: true);
+
         GridUxBehavior.Install();
         P2InteractionBehavior.Install();
         FaultRecordUxBehavior.Install();
@@ -71,19 +80,24 @@ protected override void OnStartup(StartupEventArgs e)
             new Action(() => _ = AppUpdateCoordinator.RunLazyAsync(_updateCancellation.Token)));
     }
 
-    protected override void OnActivated(EventArgs e)
+    // Style installation on every Activated/focus return used to overwrite the
+    // bundled Inter font and re-template live controls, causing visible repaint.
+    // The one-time Loaded path handles both MainWindow and independently opened FAT.
+    private readonly System.Runtime.CompilerServices.ConditionalWeakTable<Window, object> _styledWindows = new();
+
+    private void AppWindow_Loaded(object sender, RoutedEventArgs e)
     {
-        base.OnActivated(e);
+        if (sender is not Window window || !ReferenceEquals(e.OriginalSource, window))
+            return;
+        if (_styledWindows.TryGetValue(window, out _))
+            return;
 
-        // A handful of legacy controls own local visual resources. Re-apply the
-        // tiny P2 adapter when windows activate so newly opened FAT workspaces also
-        // inherit the selected industrial theme without touching engine workflows.
         P2BlueSteelGreigeUx.ApplyToOpenWindows(this);
+        _styledWindows.Add(window, new object());
 
-        // Keep onboarding task-first while preserving the existing protocol handlers:
-        // Add IED exposes SCL/CID/ICD or IP discovery, and bulk connect appears only
-        // when multiple loaded IEDs make the action useful. The behavior is dispatcher-safe.
-        if (Current?.MainWindow is MainWindow mainWindow)
+        // One onboarding install per MainWindow: model/collection notifications
+        // continue refreshing after the window is displayed.
+        if (window is MainWindow mainWindow)
             SmartIedOnboardingBehavior.Install(mainWindow);
     }
 
diff --git a/IpConnectWizardWindow.xaml b/IpConnectWizardWindow.xaml
index 01f524132..92ae8f411 100644
--- a/IpConnectWizardWindow.xaml
+++ b/IpConnectWizardWindow.xaml
@@ -1,8 +1,8 @@
 <Window x:Class="ArIED61850Tester.IpConnectWizardWindow"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        Title="Add IEC 61850 IED" Width="700" MinWidth="640" MaxHeight="660"
-        SizeToContent="Height" WindowStartupLocation="CenterOwner"
+        Title="Add IEC 61850 IED" Width="480" Height="350" MinWidth="480" MaxWidth="480"
+        SizeToContent="Manual" WindowStartupLocation="CenterOwner"
         ResizeMode="NoResize" ShowInTaskbar="False"
         Background="{DynamicResource TaskDialogCanvas}"
         FontFamily="{DynamicResource AppFontFamily}" Icon="Assets/app-icon.ico">
@@ -11,19 +11,21 @@
             <ResourceDictionary.MergedDictionaries>
                 <ResourceDictionary Source="Styles/IedTaskDialogStyles.xaml"/>
             </ResourceDictionary.MergedDictionaries>
+
             <Style x:Key="SmartIpOctet" TargetType="{x:Type TextBox}">
-                <Setter Property="Width" Value="64"/>
+                <Setter Property="Width" Value="38"/>
+                <Setter Property="Height" Value="32"/>
                 <Setter Property="MaxLength" Value="3"/>
-                <Setter Property="Height" Value="36"/>
-                <Setter Property="Padding" Value="5,5"/>
-                <Setter Property="FontSize" Value="16"/>
+                <Setter Property="Padding" Value="1,4"/>
+                <Setter Property="FontSize" Value="13"/>
                 <Setter Property="FontWeight" Value="Medium"/>
+                <Setter Property="FontFamily" Value="{DynamicResource AppFontFamily}"/>
                 <Setter Property="TextAlignment" Value="Center"/>
                 <Setter Property="VerticalContentAlignment" Value="Center"/>
                 <Setter Property="BorderThickness" Value="0"/>
                 <Setter Property="Background" Value="Transparent"/>
                 <Setter Property="Foreground" Value="{StaticResource TaskDialogInk}"/>
-                <Setter Property="CaretBrush" Value="#2563EB"/>
+                <Setter Property="CaretBrush" Value="{DynamicResource Accent}"/>
                 <Setter Property="InputMethod.IsInputMethodEnabled" Value="False"/>
                 <EventSetter Event="PreviewTextInput" Handler="Octet_PreviewTextInput"/>
                 <EventSetter Event="PreviewKeyDown" Handler="Octet_PreviewKeyDown"/>
@@ -31,161 +33,275 @@
             </Style>
             <Style x:Key="SmartIpDot" TargetType="{x:Type TextBlock}">
                 <Setter Property="Foreground" Value="{StaticResource TaskDialogMuted}"/>
-                <Setter Property="FontSize" Value="18"/>
-                <Setter Property="FontWeight" Value="SemiBold"/>
+                <Setter Property="FontSize" Value="13"/>
                 <Setter Property="VerticalAlignment" Value="Center"/>
-                <Setter Property="Margin" Value="2,0"/>
+                <Setter Property="TextAlignment" Value="Center"/>
+                <Setter Property="Width" Value="7"/>
+                <Setter Property="Margin" Value="0"/>
+            </Style>
+            <Style x:Key="SmartIpHistoryButton" TargetType="{x:Type Button}">
+                <Setter Property="Cursor" Value="Hand"/>
+                <Setter Property="Background" Value="Transparent"/>
+                <Setter Property="BorderThickness" Value="0"/>
+                <Setter Property="Template">
+                    <Setter.Value>
+                        <ControlTemplate TargetType="{x:Type Button}">
+                            <Border x:Name="HistoryChrome" Background="{TemplateBinding Background}"
+                                    CornerRadius="0,8,8,0">
+                                <!-- Google Material Icons: expand_circle_down (24dp). -->
+                                <Path Data="M12,2 C6.48,2 2,6.48 2,12 C2,17.52 6.48,22 12,22 C17.52,22 22,17.52 22,12 C22,6.48 17.52,2 12,2 Z M12,16.5 L6,10.5 7.41,9.09 12,13.67 16.59,9.09 18,10.5 Z"
+                                      Width="20" Height="20" Stretch="Uniform"
+                                      Fill="{StaticResource TaskDialogMuted}"
+                                      HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                            </Border>
+                            <ControlTemplate.Triggers>
+                                <Trigger Property="IsMouseOver" Value="True">
+                                    <Setter TargetName="HistoryChrome" Property="Background" Value="#ECF3FF"/>
+                                </Trigger>
+                                <Trigger Property="IsKeyboardFocused" Value="True">
+                                    <Setter TargetName="HistoryChrome" Property="Background" Value="#ECF3FF"/>
+                                </Trigger>
+                            </ControlTemplate.Triggers>
+                        </ControlTemplate>
+                    </Setter.Value>
+                </Setter>
+            </Style>
+            <!-- Own the disclosure chrome instead of the default black circular
+                 WPF Expander arrow; retain native IsExpanded and keyboard behavior. -->
+            <Style x:Key="SmartIpOptionsExpander" TargetType="{x:Type Expander}">
+                <Setter Property="Template">
+                    <Setter.Value>
+                        <ControlTemplate TargetType="{x:Type Expander}">
+                            <StackPanel>
+                                <ToggleButton x:Name="AdvancedToggle"
+                                              AutomationProperties.Name="Advanced settings"
+                                              HorizontalAlignment="Left" Cursor="Hand"
+                                              IsChecked="{Binding IsExpanded, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}">
+                                    <ToggleButton.Template>
+                                        <ControlTemplate TargetType="{x:Type ToggleButton}">
+                                            <Border x:Name="Chrome" CornerRadius="6" Padding="2,5"
+                                                    Background="Transparent">
+                                                <StackPanel Orientation="Horizontal">
+                                                    <!-- Same Material circle-chevron as the IP history control. -->
+                                                    <Path x:Name="AdvancedChevron"
+                                                          Data="M12,2 C6.48,2 2,6.48 2,12 C2,17.52 6.48,22 12,22 C17.52,22 22,17.52 22,12 C22,6.48 17.52,2 12,2 Z M12,16.5 L6,10.5 7.41,9.09 12,13.67 16.59,9.09 18,10.5 Z"
+                                                          Width="17" Height="17" Stretch="Uniform"
+                                                          RenderTransformOrigin="0.5,0.5"
+                                                          Fill="{StaticResource TaskDialogMuted}"
+                                                          VerticalAlignment="Center"/>
+                                                    <TextBlock Text="Advanced settings"
+                                                               Margin="8,0,0,0" FontSize="11.5"
+                                                               Foreground="{StaticResource TaskDialogMuted}"
+                                                               VerticalAlignment="Center"/>
+                                                </StackPanel>
+                                            </Border>
+                                            <ControlTemplate.Triggers>
+                                                <Trigger Property="IsChecked" Value="True">
+                                                    <Setter TargetName="AdvancedChevron" Property="RenderTransform">
+                                                        <Setter.Value>
+                                                            <RotateTransform Angle="180"/>
+                                                        </Setter.Value>
+                                                    </Setter>
+                                                </Trigger>
+                                                <Trigger Property="IsMouseOver" Value="True">
+                                                    <Setter TargetName="Chrome" Property="Background" Value="#EAF2FF"/>
+                                                </Trigger>
+                                                <Trigger Property="IsKeyboardFocused" Value="True">
+                                                    <Setter TargetName="Chrome" Property="Background" Value="#EAF2FF"/>
+                                                </Trigger>
+                                            </ControlTemplate.Triggers>
+                                        </ControlTemplate>
+                                    </ToggleButton.Template>
+                                </ToggleButton>
+                                <ContentPresenter x:Name="ExpandSite" ContentSource="Content"
+                                                  Visibility="Collapsed"/>
+                            </StackPanel>
+                            <ControlTemplate.Triggers>
+                                <Trigger Property="IsExpanded" Value="True">
+                                    <Setter TargetName="ExpandSite" Property="Visibility" Value="Visible"/>
+                                </Trigger>
+                            </ControlTemplate.Triggers>
+                        </ControlTemplate>
+                    </Setter.Value>
+                </Setter>
             </Style>
         </ResourceDictionary>
     </Window.Resources>
+
     <ScrollViewer VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Disabled"
                   Focusable="False">
-        <Grid Margin="24,22,24,22">
+        <Grid Margin="24,19,24,18">
             <Grid.RowDefinitions>
                 <RowDefinition Height="Auto"/>
                 <RowDefinition Height="Auto"/>
                 <RowDefinition Height="Auto"/>
             </Grid.RowDefinitions>
+
             <StackPanel>
-                <TextBlock Text="Add IEC 61850 IED" Style="{StaticResource TaskDialogHeading}"/>
-                <TextBlock Margin="0,5,0,0" Style="{StaticResource TaskDialogSubtitle}"
-                           Text="Enter a device address to discover its IEC 61850 data model."/>
+                <TextBlock Text="Connect to IED" FontSize="17" FontWeight="SemiBold"
+                           Foreground="{StaticResource TaskDialogInk}"/>
+                <TextBlock Text="Enter the IP address of your device."
+                           Margin="0,4,0,0" FontSize="11.5"
+                           Foreground="{StaticResource TaskDialogMuted}"/>
             </StackPanel>
-            <Border Grid.Row="1" Margin="0,18,0,0" Style="{StaticResource TaskDialogCardStyle}">
-                <StackPanel>
-                    <Grid>
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="*"/>
-                            <ColumnDefinition Width="14"/>
-                            <ColumnDefinition Width="120"/>
-                        </Grid.ColumnDefinitions>
-                        <StackPanel Grid.Column="0">
-                            <TextBlock Text="IED IP address" Style="{StaticResource TaskDialogFieldLabel}" Margin="0,0,0,7"/>
-                            <Border x:Name="IpEditorHost" Height="44" CornerRadius="10"
-                                    BorderThickness="1.5"
-                                    Background="{StaticResource TaskDialogCard}">
-                                <Border.Style>
-                                    <Style TargetType="Border">
-                                        <Setter Property="BorderBrush" Value="{StaticResource TaskDialogBorder}"/>
-                                        <Style.Triggers>
-                                            <Trigger Property="IsKeyboardFocusWithin" Value="True">
-                                                <Setter Property="BorderBrush" Value="#3B82F6"/>
-                                            </Trigger>
-                                            <Trigger Property="IsMouseOver" Value="True">
-                                                <Setter Property="BorderBrush" Value="#86AEEF"/>
-                                            </Trigger>
-                                        </Style.Triggers>
-                                    </Style>
-                                </Border.Style>
-                                <Grid>
-                                    <Grid.ColumnDefinitions>
-                                        <ColumnDefinition Width="*"/>
-                                        <ColumnDefinition Width="44"/>
-                                    </Grid.ColumnDefinitions>
-                                    <StackPanel x:Name="OctetEditor" Grid.Column="0" Orientation="Horizontal"
-                                                HorizontalAlignment="Center" VerticalAlignment="Center">
-                                        <TextBox x:Name="Octet1Box" Style="{StaticResource SmartIpOctet}"
-                                                 AutomationProperties.Name="IPv4 octet 1, 0 through 255"/>
-                                        <TextBlock Text="." Style="{StaticResource SmartIpDot}"/>
-                                        <TextBox x:Name="Octet2Box" Style="{StaticResource SmartIpOctet}"
-                                                 AutomationProperties.Name="IPv4 octet 2, 0 through 255"/>
-                                        <TextBlock Text="." Style="{StaticResource SmartIpDot}"/>
-                                        <TextBox x:Name="Octet3Box" Style="{StaticResource SmartIpOctet}"
-                                                 AutomationProperties.Name="IPv4 octet 3, 0 through 255"/>
-                                        <TextBlock Text="." Style="{StaticResource SmartIpDot}"/>
-                                        <TextBox x:Name="Octet4Box" Style="{StaticResource SmartIpOctet}"
-                                                 AutomationProperties.Name="IPv4 octet 4, 0 through 255"/>
-                                    </StackPanel>
-                                    <Button x:Name="HistoryButton" Grid.Column="1" Content="⌄"
-                                            FontSize="18" ToolTip="Search previously entered and connected IED addresses"
-                                            AutomationProperties.Name="Show address history"
-                                            Click="HistoryButton_Click"
-                                            Style="{StaticResource TaskDialogButtonBase}"
-                                            Padding="7,0" BorderThickness="0,0,0,0" Background="Transparent"/>
-                                </Grid>
-                            </Border>
-                            <Popup x:Name="HistoryPopup" PlacementTarget="{Binding ElementName=IpEditorHost}"
-                                   Placement="Bottom" VerticalOffset="4" AllowsTransparency="True"
-                                   StaysOpen="False" PopupAnimation="Fade">
-                                <Border Width="432" MaxHeight="270" CornerRadius="12" Background="White"
-                                        BorderThickness="1" BorderBrush="{StaticResource TaskDialogBorder}"
-                                        Padding="10" SnapsToDevicePixels="True">
-                                    <StackPanel>
-                                        <TextBox x:Name="HistorySearchBox" Height="34" Padding="9,5"
-                                                 VerticalContentAlignment="Center" Background="#F5F8FD"
-                                                 BorderBrush="{StaticResource TaskDialogBorder}"
-                                                 ToolTip="Filter by IP or saved IED name"
-                                                 AutomationProperties.Name="Search IED address history"
-                                                 TextChanged="HistorySearchBox_TextChanged"
-                                                 PreviewKeyDown="HistorySearchBox_PreviewKeyDown"/>
-                                        <ListBox x:Name="HistoryListBox" MaxHeight="202" Margin="0,6,0,0"
-                                                 BorderThickness="0" Background="Transparent"
-                                                 ScrollViewer.HorizontalScrollBarVisibility="Disabled"
-                                                 MouseLeftButtonUp="HistoryListBox_MouseLeftButtonUp"
-                                                 PreviewKeyDown="HistoryListBox_PreviewKeyDown">
-                                            <ListBox.ItemTemplate>
-                                                <DataTemplate>
-                                                    <StackPanel Margin="5,4">
-                                                        <TextBlock Text="{Binding IpAddress}" FontSize="13"
-                                                                   FontWeight="SemiBold" Foreground="{StaticResource TaskDialogInk}"/>
-                                                        <TextBlock Text="{Binding Subtitle}" FontSize="11"
-                                                                   Foreground="{StaticResource TaskDialogMuted}"/>
-                                                    </StackPanel>
-                                                </DataTemplate>
-                                            </ListBox.ItemTemplate>
-                                        </ListBox>
-                                        <TextBlock x:Name="HistoryEmptyText" Margin="8,8,0,5"
-                                                   Text="No matching saved addresses"
-                                                   Visibility="Collapsed" Style="{StaticResource TaskDialogSubtitle}"/>
-                                    </StackPanel>
-                                </Border>
-                            </Popup>
-                            <TextBox x:Name="RawIpBox" Height="44" Margin="0,0,0,0" Padding="12,7"
-                                     VerticalContentAlignment="Center" Visibility="Collapsed"
-                                     Foreground="{StaticResource TaskDialogInk}"
-                                     BorderBrush="{StaticResource TaskDialogBorder}"
-                                     Text="{Binding RelayIpAddress, RelativeSource={RelativeSource AncestorType=Window}, UpdateSourceTrigger=LostFocus}"
-                                     ToolTip="Advanced input: IPv4 or IPv6 literal"
-                                     AutomationProperties.Name="Advanced IPv4 or IPv6 address"/>
-                            <CheckBox x:Name="ManualAddressCheck" Margin="1,10,0,0"
-                                      Content="Advanced: IPv6 / manual address" FontSize="11.5"
-                                      Foreground="{StaticResource TaskDialogMuted}"
-                                      Click="ManualAddressCheck_Click"/>
-                        </StackPanel>
-                        <StackPanel Grid.Column="2">
-                            <TextBlock Text="MMS port" Style="{StaticResource TaskDialogFieldLabel}" Margin="0,0,0,7"/>
-                            <TextBox Height="44" VerticalContentAlignment="Center" Padding="9,5"
-                                     Foreground="{StaticResource TaskDialogInk}" Background="{StaticResource TaskDialogCard}"
-                                     BorderBrush="{StaticResource TaskDialogBorder}"
-                                     ToolTip="IEC 61850 MMS normally uses TCP port 102"
-                                     Text="{Binding MmsPortText, RelativeSource={RelativeSource AncestorType=Window}, UpdateSourceTrigger=PropertyChanged}"/>
-                        </StackPanel>
-                    </Grid>
-                    <TextBlock x:Name="AddressHintText" Margin="2,8,0,0"
-                               Style="{StaticResource TaskDialogSubtitle}"
-                               Text="Enter four IPv4 numbers (0–255). Use dot, arrows, Tab or paste a complete address."/>
-                    <Border Margin="0,14,0,0" Background="{StaticResource TaskDialogHintSurface}"
-                            BorderBrush="{StaticResource TaskDialogHintBorder}"
-                            BorderThickness="1" CornerRadius="10" Padding="12,10">
+
+            <StackPanel Grid.Row="1" Margin="0,21,0,0">
+                <TextBlock Text="IP address" FontSize="12" FontWeight="SemiBold"
+                           Foreground="{StaticResource TaskDialogInk}" Margin="0,0,0,8"/>
+                <Grid>
+                    <Border x:Name="IpEditorHost" Width="265" Height="43" HorizontalAlignment="Left" CornerRadius="9"
+                            BorderThickness="1" Background="{StaticResource TaskDialogCard}">
+                        <Border.Style>
+                            <Style TargetType="Border">
+                                <Setter Property="BorderBrush" Value="{StaticResource TaskDialogBorder}"/>
+                                <Style.Triggers>
+                                    <Trigger Property="IsMouseOver" Value="True">
+                                        <Setter Property="BorderBrush" Value="#A4BAD3"/>
+                                    </Trigger>
+                                    <Trigger Property="IsKeyboardFocusWithin" Value="True">
+                                        <Setter Property="BorderBrush" Value="{DynamicResource Accent}"/>
+                                    </Trigger>
+                                </Style.Triggers>
+                            </Style>
+                        </Border.Style>
+                        <Grid>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="*"/>
+                                <ColumnDefinition Width="1"/>
+                                <ColumnDefinition Width="40"/>
+                            </Grid.ColumnDefinitions>
+                            <StackPanel x:Name="OctetEditor" Orientation="Horizontal"
+                                        HorizontalAlignment="Center"
+                                        VerticalAlignment="Center">
+                                <TextBox x:Name="Octet1Box" Style="{StaticResource SmartIpOctet}"
+                                         AutomationProperties.Name="IP address, group 1"/>
+                                <TextBlock Text="." Style="{StaticResource SmartIpDot}"/>
+                                <TextBox x:Name="Octet2Box" Style="{StaticResource SmartIpOctet}"
+                                         AutomationProperties.Name="IP address, group 2"/>
+                                <TextBlock Text="." Style="{StaticResource SmartIpDot}"/>
+                                <TextBox x:Name="Octet3Box" Style="{StaticResource SmartIpOctet}"
+                                         AutomationProperties.Name="IP address, group 3"/>
+                                <TextBlock Text="." Style="{StaticResource SmartIpDot}"/>
+                                <TextBox x:Name="Octet4Box" Style="{StaticResource SmartIpOctet}"
+                                         AutomationProperties.Name="IP address, group 4"/>
+                            </StackPanel>
+                            <Border Grid.Column="1" Height="20"
+                                    Background="{StaticResource TaskDialogBorder}"
+                                    VerticalAlignment="Center"/>
+                            <Button x:Name="HistoryButton" Grid.Column="2"
+                                    Style="{StaticResource SmartIpHistoryButton}"
+                                    ToolTip="Choose a recently entered address"
+                                    AutomationProperties.Name="Recent IP addresses"
+                                    Click="HistoryButton_Click"/>
+                        </Grid>
+                    </Border>
+                    <TextBox x:Name="RawIpBox" Width="265" Height="43" HorizontalAlignment="Left" Padding="12,7"
+                             VerticalContentAlignment="Center" Visibility="Collapsed"
+                             FontSize="13"
+                             Foreground="{StaticResource TaskDialogInk}"
+                             Background="{StaticResource TaskDialogCard}"
+                             BorderBrush="{StaticResource TaskDialogBorder}"
+                             Text="{Binding RelayIpAddress, RelativeSource={RelativeSource AncestorType=Window}, UpdateSourceTrigger=LostFocus}"
+                             ToolTip="Enter an IP address manually"
+                             AutomationProperties.Name="Manual IP address"/>
+                </Grid>
+
+                <Popup x:Name="HistoryPopup" PlacementTarget="{Binding ElementName=IpEditorHost}"
+                       Placement="Bottom" VerticalOffset="4" AllowsTransparency="True"
+                       StaysOpen="False" PopupAnimation="Fade">
+                    <Border Width="{Binding ActualWidth, ElementName=IpEditorHost}"
+                            MaxHeight="240" CornerRadius="10" Background="White"
+                            BorderThickness="1" BorderBrush="{StaticResource TaskDialogBorder}"
+                            Padding="10" SnapsToDevicePixels="True">
+                        <Border.Effect>
+                            <DropShadowEffect Color="#25334D" BlurRadius="12" ShadowDepth="3" Opacity="0.15"/>
+                        </Border.Effect>
                         <StackPanel>
-                            <TextBlock Text="Smart discovery" FontSize="12.5" FontWeight="SemiBold"
+                            <TextBlock Text="Recent addresses" Margin="5,0,0,7"
+                                       FontFamily="{DynamicResource AppFontFamily}"
+                                       FontSize="11.5" FontWeight="SemiBold"
                                        Foreground="{StaticResource TaskDialogInk}"/>
-                            <TextBlock Margin="0,3,0,0" Style="{StaticResource TaskDialogSubtitle}"
-                                       Text="Reads the live DataSets and RCBs, and restores saved signal choices."/>
+                            <TextBox x:Name="HistorySearchBox" Height="33" Padding="9,5"
+                                     FontFamily="{DynamicResource AppFontFamily}"
+                                     VerticalContentAlignment="Center" FontSize="12"
+                                     Background="#F8FAFD"
+                                     BorderBrush="{StaticResource TaskDialogBorder}"
+                                     ToolTip="Filter saved IP addresses"
+                                     AutomationProperties.Name="Search saved addresses"
+                                     TextChanged="HistorySearchBox_TextChanged"
+                                     PreviewKeyDown="HistorySearchBox_PreviewKeyDown"/>
+                            <ListBox x:Name="HistoryListBox" MaxHeight="158" Margin="0,5,0,0"
+                                     FontFamily="{DynamicResource AppFontFamily}"
+                                     FontSize="12" BorderThickness="0" Background="Transparent"
+                                     ScrollViewer.HorizontalScrollBarVisibility="Disabled"
+                                     MouseLeftButtonUp="HistoryListBox_MouseLeftButtonUp"
+                                     PreviewKeyDown="HistoryListBox_PreviewKeyDown">
+                                <ListBox.ItemTemplate>
+                                    <DataTemplate>
+                                        <StackPanel Margin="7,5">
+                                            <TextBlock Text="{Binding IpAddress}" FontSize="12.5"
+                                                       FontWeight="Medium"
+                                                       Foreground="{StaticResource TaskDialogInk}"/>
+                                            <TextBlock Text="{Binding Subtitle}" FontSize="11"
+                                                       Foreground="{StaticResource TaskDialogMuted}"/>
+                                        </StackPanel>
+                                    </DataTemplate>
+                                </ListBox.ItemTemplate>
+                            </ListBox>
+                            <TextBlock x:Name="HistoryEmptyText" Margin="7,8,0,3"
+                                       FontFamily="{DynamicResource AppFontFamily}"
+                                       Text="No matching addresses" Visibility="Collapsed"
+                                       Style="{StaticResource TaskDialogSubtitle}"/>
                         </StackPanel>
                     </Border>
-                    <TextBlock x:Name="WizardStatusText" Margin="0,12,0,0"
-                               Style="{StaticResource TaskDialogError}"
-                               AutomationProperties.LiveSetting="Assertive"/>
-                </StackPanel>
-            </Border>
-            <StackPanel Grid.Row="2" Orientation="Horizontal" HorizontalAlignment="Right"
-                        Margin="0,18,0,0">
-                <Button Content="Cancel" Style="{StaticResource TaskDialogFooterButton}"
-                        Click="Cancel_Click" IsCancel="True" Margin="0,0,10,0"/>
-                <Button Content="Connect &amp; Discover" Style="{StaticResource TaskDialogSubmitAction}"
-                        MinWidth="174" MinHeight="38" IsDefault="True" Click="Connect_Click"/>
+                </Popup>
+
+                <TextBlock x:Name="AddressHintText" Text="Example: 192.168.1.10"
+                           FontSize="11" Margin="2,7,0,0"
+                           Foreground="{StaticResource TaskDialogMuted}"/>
+
+                <Expander x:Name="MoreOptionsExpander" Margin="0,12,0,0"
+                          Style="{StaticResource SmartIpOptionsExpander}"
+                          AutomationProperties.Name="Advanced connection settings">
+                    <StackPanel Margin="2,9,0,0">
+                        <TextBlock Text="Port" FontSize="11"
+                                   Foreground="{StaticResource TaskDialogMuted}"
+                                   Margin="0,0,0,5"/>
+                        <Border Width="96" Height="36" HorizontalAlignment="Left"
+                                Background="{StaticResource TaskDialogCard}"
+                                BorderBrush="{StaticResource TaskDialogBorder}"
+                                BorderThickness="1" CornerRadius="9">
+                            <TextBox x:Name="MmsPortBox" BorderThickness="0"
+                                     Background="Transparent" Padding="10,5"
+                                     FontSize="12" VerticalContentAlignment="Center"
+                                     Foreground="{StaticResource TaskDialogInk}"
+                                     ToolTip="Default port: 102"
+                                     Text="{Binding MmsPortText, RelativeSource={RelativeSource AncestorType=Window}, UpdateSourceTrigger=PropertyChanged}"/>
+                        </Border>
+                    </StackPanel>
+                </Expander>
+
+                <TextBlock x:Name="WizardStatusText" Margin="2,9,0,0"
+                           Style="{StaticResource TaskDialogError}"
+                           AutomationProperties.LiveSetting="Assertive"/>
             </StackPanel>
+
+            <Grid Grid.Row="2" Margin="0,20,0,0">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="1"/>
+                    <RowDefinition Height="Auto"/>
+                </Grid.RowDefinitions>
+                <Border Background="{StaticResource TaskDialogBorder}" Opacity="0.7"/>
+                <StackPanel Grid.Row="1" Orientation="Horizontal"
+                            HorizontalAlignment="Right" Margin="0,13,0,0">
+                    <Button Content="Cancel" Style="{StaticResource TaskDialogFooterButton}"
+                            MinHeight="36" MinWidth="92" Padding="14,7"
+                            Click="Cancel_Click" IsCancel="True" Margin="0,0,9,0"/>
+                    <Button Content="Connect" Style="{StaticResource TaskDialogSubmitAction}"
+                            MinWidth="114" MinHeight="36" Padding="16,7"
+                            IsDefault="True" Click="Connect_Click"/>
+                </StackPanel>
+            </Grid>
         </Grid>
     </ScrollViewer>
 </Window>
diff --git a/IpConnectWizardWindow.xaml.cs b/IpConnectWizardWindow.xaml.cs
index 41ec4a3ab..6ec671606 100644
--- a/IpConnectWizardWindow.xaml.cs
+++ b/IpConnectWizardWindow.xaml.cs
@@ -36,6 +36,7 @@ public string MmsPortText
     private readonly bool _rememberDiscoveryEndpoint;
     private readonly ICollectionView _historyView;
     private bool _updatingOctets;
+    private bool _rawAddressMode;
     public int MmsPort { get; private set; } = 102;
 
     // UI projection ONLY; UserPreferenceStore remains the sole persistence authority.
@@ -71,13 +72,16 @@ public IpConnectWizardWindow(string initialIp = "", int initialPort = 102,
         }
         MmsPortText = selectedPort.ToString(CultureInfo.InvariantCulture);
         ApplyAddress(selectedIp);
+        // Never conceal a nonstandard port in the collapsed expert section.
+        if (selectedPort != 102)
+            MoreOptionsExpander.IsExpanded = true;
 
         foreach (var box in Octets)
             DataObject.AddPastingHandler(box, Octet_Pasting);
 
         Loaded += (_, _) =>
         {
-            if (ManualAddressCheck.IsChecked == true) RawIpBox.Focus();
+            if (_rawAddressMode) RawIpBox.Focus();
             else Octet1Box.Focus();
         };
     }
@@ -126,7 +130,7 @@ private void ApplyAddress(string address)
         RelayIpAddress = address;
         if (TrySplitIpv4(address, out var parts))
         {
-            ManualAddressCheck.IsChecked = false;
+            _rawAddressMode = false;
             _updatingOctets = true;
             try
             {
@@ -138,13 +142,13 @@ private void ApplyAddress(string address)
         }
         else if (!string.IsNullOrWhiteSpace(address))
         {
-            ManualAddressCheck.IsChecked = true;
+            _rawAddressMode = true;
             RawIpBox.Text = address;
             SetAddressMode(true);
         }
         else
         {
-            ManualAddressCheck.IsChecked = false;
+            _rawAddressMode = false;
             _updatingOctets = true;
             try { foreach (var box in Octets) box.Clear(); }
             finally { _updatingOctets = false; }
@@ -159,41 +163,10 @@ private void SetAddressMode(bool manual)
         OctetEditor.Visibility = manual ? Visibility.Collapsed : Visibility.Visible;
         HistoryButton.Visibility = manual ? Visibility.Collapsed : Visibility.Visible;
         RawIpBox.Visibility = manual ? Visibility.Visible : Visibility.Collapsed;
+        _rawAddressMode = manual;
         AddressHintText.Text = manual
-            ? "Enter a numeric IPv6 or IPv4 address. Connection starts only when you confirm."
-            : "Enter four IPv4 numbers (0–255). Use dot, arrows, Tab or paste a complete address.";
-    }
-
-    private void ManualAddressCheck_Click(object sender, RoutedEventArgs e)
-    {
-        var manual = ManualAddressCheck.IsChecked == true;
-        if (manual && TryNormalizeIpv4Octets(Octets.Select(b => b.Text).ToArray(), out var ip))
-        {
-            RelayIpAddress = ip;
-            RawIpBox.Text = ip;
-        }
-        else if (!manual && TrySplitIpv4(RawIpBox.Text, out var parts))
-        {
-            _updatingOctets = true;
-            try
-            {
-                var boxes = Octets;
-                for (int i = 0; i < 4; i++) boxes[i].Text = parts[i];
-            }
-            finally { _updatingOctets = false; }
-        }
-        else if (!manual && !string.IsNullOrWhiteSpace(RawIpBox.Text))
-        {
-            // Never silently truncate a valid IPv6 literal into four octets.
-            ManualAddressCheck.IsChecked = true;
-            WizardStatusText.Text = "IPv6 requires Advanced / manual address mode.";
-            return;
-        }
-
-        SetAddressMode(manual);
-        if (manual) RawIpBox.Focus();
-        else Octet1Box.Focus();
-        WizardStatusText.Text = string.Empty;
+            ? "Enter the address exactly as provided."
+            : "Example: 192.168.1.10";
     }
 
     private int OctetIndex(TextBox box) => Array.IndexOf(Octets, box);
@@ -222,7 +195,7 @@ private void Octet_PreviewTextInput(object sender, TextCompositionEventArgs e)
         if (!IsValidPartialOctet(replacement))
         {
             e.Handled = true;
-            WizardStatusText.Text = "Each IPv4 octet must be a number from 0 to 255.";
+            WizardStatusText.Text = "Each number must be between 0 and 255.";
         }
     }
 
@@ -284,7 +257,7 @@ private void Octet_Pasting(object sender, DataObjectPastingEventArgs e)
                 FocusOctet(3, atEnd: true);
             }
             else
-                WizardStatusText.Text = "Paste a complete IPv4 address with four octets (0–255).";
+                WizardStatusText.Text = "Paste a full IP address, for example 192.168.1.10.";
             return;
         }
 
@@ -293,7 +266,7 @@ private void Octet_Pasting(object sender, DataObjectPastingEventArgs e)
         if (!IsValidPartialOctet(next))
         {
             e.CancelCommand();
-            WizardStatusText.Text = "Each IPv4 octet must be a number from 0 to 255.";
+            WizardStatusText.Text = "Each number must be between 0 and 255.";
         }
     }
 
@@ -362,8 +335,10 @@ private void CommitHistorySelection()
         // Selecting history restores the exact saved IP:port, even when unverified.
         // This is recall only; the connection still requires explicit submission.
         MmsPortText = selection.MmsPort.ToString(CultureInfo.InvariantCulture);
+        if (selection.MmsPort != 102)
+            MoreOptionsExpander.IsExpanded = true;
         HistoryPopup.IsOpen = false;
-        if (ManualAddressCheck.IsChecked == true) RawIpBox.Focus();
+        if (_rawAddressMode) RawIpBox.Focus();
         else Octet1Box.Focus();
         // Recalling an endpoint is UI-only. Only Connect_Click submits.
     }
@@ -371,12 +346,12 @@ private void CommitHistorySelection()
     private void Connect_Click(object sender, RoutedEventArgs e)
     {
         string submittedAddress;
-        if (ManualAddressCheck.IsChecked == true)
+        if (_rawAddressMode)
         {
             submittedAddress = RawIpBox.Text.Trim();
             if (!IPAddress.TryParse(submittedAddress, out _))
             {
-                WizardStatusText.Text = "Enter a valid IPv4 or IPv6 address.";
+                WizardStatusText.Text = "Enter a valid IP address.";
                 RawIpBox.Focus();
                 return;
             }
@@ -385,7 +360,7 @@ private void Connect_Click(object sender, RoutedEventArgs e)
         {
             if (!TryNormalizeIpv4Octets(Octets.Select(b => b.Text).ToArray(), out submittedAddress))
             {
-                WizardStatusText.Text = "Complete all four IPv4 octets, each between 0 and 255.";
+                WizardStatusText.Text = "Enter all four parts of the IP address (0–255).";
                 return;
             }
         }
@@ -394,7 +369,7 @@ private void Connect_Click(object sender, RoutedEventArgs e)
                 out var port) || port is <= 0 or > 65535)
         {
             WizardStatusText.Text =
-                "MMS port must be between 1 and 65535. Standard IEC 61850 MMS uses TCP 102.";
+                "Port must be between 1 and 65535.";
             return;
         }
 
diff --git a/MainWindow.IedBrowser.Performance.cs b/MainWindow.IedBrowser.Performance.cs
index ef2157eb8..78316b4de 100644
--- a/MainWindow.IedBrowser.Performance.cs
+++ b/MainWindow.IedBrowser.Performance.cs
@@ -9,10 +9,7 @@ namespace ArIED61850Tester;
 public partial class MainWindow
 {
     private readonly IedBrowserUnitProjectionCache _iedBrowserUnitCache = new();
-    // Weak model keys: indexed declarations are reused when returning to SG7_BCU,
-    // without retaining replaced engineering models indefinitely.
-    private readonly ConditionalWeakTable<LiveIedModelDiscoveryDocument, Task<IedBrowserSchemaIndex>>
-        _iedBrowserSchemaTasks = new();
+    // Schema tasks are shared with Read bindings through SharedIedSchemaIndex.
     private Task<IedBrowserSchemaIndex>? _iedBrowserAwaitedSchema;
     private Iec61850MonitorDevice? _iedBrowserAwaitedSchemaDevice;
     private Iec61850MonitorDevice? _iedBrowserPreparingDevice;
@@ -71,13 +68,7 @@ private bool TryActivateIedBrowserSchema(
             _iedBrowserValueSchemaIndex = null;
             return true;
         }
-        var task = _iedBrowserSchemaTasks.GetValue(model, source =>
-            Task.Run(() =>
-            {
-                using var measure = IedBrowserPerformanceProbe.Measure(
-                    "Schema.Index", device.Name);
-                return new IedBrowserSchemaIndex(source);
-            }));
+        var task = SharedIedSchemaIndex.PrepareAsync(model);
         if (task.IsCompletedSuccessfully)
         {
             _iedBrowserValueSchemaIndex = task.Result;
diff --git a/MainWindow.IedBrowser.cs b/MainWindow.IedBrowser.cs
index 0ed2ce231..04a8587fd 100644
--- a/MainWindow.IedBrowser.cs
+++ b/MainWindow.IedBrowser.cs
@@ -221,9 +221,8 @@ private void IedBrowserRefresh_Click(object sender, RoutedEventArgs e)
         if (SelectedDevice is { } selected)
         {
             var model = selected.LiveDiscoveryModel ?? selected.SclWorkspace?.DesignModel;
-            if (model is not null && _iedBrowserSchemaTasks.TryGetValue(model, out var indexTask) &&
-                indexTask.IsFaulted)
-                _iedBrowserSchemaTasks.Remove(model);
+            if (model is not null)
+                SharedIedSchemaIndex.ForgetFaulted(model);
         }
         // Explicit refresh deliberately discards cached local SCL inventories.
         // Routine IED switching keeps the bounded per-source cache warm.
diff --git a/MainWindow.TopBarContainerHardening.cs b/MainWindow.TopBarContainerHardening.cs
index bce6fe911..fefce9d6a 100644
--- a/MainWindow.TopBarContainerHardening.cs
+++ b/MainWindow.TopBarContainerHardening.cs
@@ -67,10 +67,9 @@ private static void Apply(MainWindow window)
 
         if (window.FindName("WorkflowNavShell") is Border shell)
         {
-            shell.Height = 64d;
-            shell.MinHeight = 64d;
+            // NavigationLayoutFix owns shell height (60) and padding. The
+            // container guard only prevents clipping/Z-order mistakes.
             shell.Margin = new Thickness(0, 2, 0, 2);
-            shell.Padding = new Thickness(5, 7, 5, 7);
             shell.ClipToBounds = false;
             Panel.SetZIndex(shell, 60);
         }
diff --git a/MainWindow.xaml b/MainWindow.xaml
index d779e5560..4dce39b23 100644
--- a/MainWindow.xaml
+++ b/MainWindow.xaml
@@ -4,7 +4,7 @@
         xmlns:views="clr-namespace:ArIED61850Tester.Views"
         Title="ARSAS - Smart IEC 61850 Communication Tester"
         Height="900" Width="1480" MinHeight="760" MinWidth="1180"
-        WindowStartupLocation="CenterScreen" Background="{StaticResource AppBackgroundGradient}"
+        WindowStartupLocation="CenterScreen" WindowState="Maximized" Background="{StaticResource AppBackgroundGradient}"
         FontFamily="{StaticResource AppFontFamily}"
         UseLayoutRounding="True" SnapsToDevicePixels="True"
         TextOptions.TextFormattingMode="Ideal"
diff --git a/Models/CanonicalValueChangeJournal.cs b/Models/CanonicalValueChangeJournal.cs
new file mode 100644
index 000000000..044b71957
--- /dev/null
+++ b/Models/CanonicalValueChangeJournal.cs
@@ -0,0 +1,77 @@
+namespace ArIED61850Tester.Models;
+
+/// <summary>
+/// Revision-only notification from the canonical ledger. This is NOT another
+/// live-value store, Report decoder, event history, or IEC acquisition channel.
+/// Readers always resolve the current evidence through IedBrowserLiveValues.
+/// </summary>
+public enum CanonicalValueChangeKind
+{
+    AssociationInvalidated,
+    Report,
+    Read,
+    ReportCompanion
+}
+
+public sealed record CanonicalValueChange(
+    long Revision, long Association, string Reference, string FunctionalConstraint,
+    CanonicalValueChangeKind Kind);
+
+public sealed record CanonicalValueChangeBatch(
+    long ThroughRevision, long LatestRevision, bool RequiresFullRefresh,
+    IReadOnlyList<CanonicalValueChange> Changes);
+
+/// <summary>
+/// Constant-memory revision ring shared by arbitrarily many independent cursor
+/// readers. All methods run within the enclosing IedBrowserLiveValues gate:
+/// there is no second lock, cross-thread event handler, UI callback, or queue
+/// consumer that can steal another workspace's notifications.
+/// </summary>
+internal sealed class CanonicalValueChangeJournal
+{
+    private readonly CanonicalValueChange?[] _ring;
+    private int _count;
+    private long _latestRevision;
+
+    internal CanonicalValueChangeJournal(int capacity = 4096)
+    {
+        if (capacity < 2) throw new ArgumentOutOfRangeException(nameof(capacity));
+        _ring = new CanonicalValueChange[capacity];
+    }
+
+    internal void Append(CanonicalValueChange change)
+    {
+        if (change.Revision != _latestRevision + 1)
+            throw new InvalidOperationException("Canonical revision journal must be contiguous.");
+        _latestRevision = change.Revision;
+        _ring[(int)(_latestRevision % _ring.Length)] = change;
+        if (_count < _ring.Length) _count++;
+    }
+
+    internal CanonicalValueChangeBatch Read(long afterRevision, int maxChanges)
+    {
+        if (maxChanges is < 1 or > 4096)
+            throw new ArgumentOutOfRangeException(nameof(maxChanges));
+        if (afterRevision < 0 || afterRevision > _latestRevision)
+            return new(_latestRevision, _latestRevision, true, []);
+        if (afterRevision == _latestRevision)
+            return new(afterRevision, _latestRevision, false, []);
+
+        var earliestRetained = _latestRevision - _count + 1;
+        if (afterRevision < earliestRetained - 1)
+            return new(_latestRevision, _latestRevision, true, []);
+
+        var upper = Math.Min(_latestRevision, afterRevision + maxChanges);
+        var changes = new CanonicalValueChange[(int)(upper - afterRevision)];
+        var invalidated = false;
+        for (long revision = afterRevision + 1; revision <= upper; revision++)
+        {
+            var change = _ring[(int)(revision % _ring.Length)]!;
+            if (change.Revision != revision)
+                return new(_latestRevision, _latestRevision, true, []);
+            changes[(int)(revision - afterRevision - 1)] = change;
+            invalidated |= change.Kind == CanonicalValueChangeKind.AssociationInvalidated;
+        }
+        return new(upper, _latestRevision, invalidated, changes);
+    }
+}
diff --git a/Models/IedBrowserLiveValues.cs b/Models/IedBrowserLiveValues.cs
index 57e24b394..02bac0a9e 100644
--- a/Models/IedBrowserLiveValues.cs
+++ b/Models/IedBrowserLiveValues.cs
@@ -33,6 +33,21 @@ public sealed class IedBrowserLiveValues
     private readonly Dictionary<string, IedBrowserObservationChannels> _values =
         new(StringComparer.Ordinal);
     private long _version;
+    // One bounded cursor-based change journal for every workspace. SSOT holds
+    // the actual immutable observations; the journal holds only dirty keys.
+    private readonly CanonicalValueChangeJournal _changeJournal = new();
+    public CanonicalValueChangeBatch ReadChanges(long afterRevision, int maxChanges = 256)
+    {
+        lock (_gate) return _changeJournal.Read(afterRevision, maxChanges);
+    }
+
+    private void RecordChange(string reference, string fc, CanonicalValueChangeKind kind)
+    {
+        // Called only while holding _gate, after _version advances exactly once.
+        _changeJournal.Append(new CanonicalValueChange(
+            _version, _association, CanonicalReference(reference),
+            (fc ?? "").Trim().ToUpperInvariant(), kind));
+    }
     // Only CF changes invalidate engineering-unit projection; ordinary ST/MX
     // report traffic must not rebuild its signal/unit directory.
     private long _configurationVersion;
@@ -69,6 +84,7 @@ public long BeginAssociation()
             _values.Clear();
             _configurationVersion++;
             _version++;
+            RecordChange("", "", CanonicalValueChangeKind.AssociationInvalidated);
             return _association;
         }
     }
@@ -82,6 +98,7 @@ public void MarkOffline()
             _association++; // invalidate in-flight callbacks even before reconnect
             _configurationVersion++;
             _version++;
+            RecordChange("", "", CanonicalValueChangeKind.AssociationInvalidated);
         }
     }
 
@@ -94,6 +111,7 @@ public void Clear()
             _values.Clear();
             _configurationVersion++;
             _version++;
+            RecordChange("", "", CanonicalValueChangeKind.AssociationInvalidated);
         }
     }
 
@@ -162,6 +180,7 @@ channels.Report is not { } prior ||
             };
             _values[key] = channels with { Report = updated };
             _version++;
+            RecordChange(processReference, fc, CanonicalValueChangeKind.ReportCompanion);
             return true;
         }
     }
@@ -241,6 +260,9 @@ quality is not ("Unknown" or "Pending / q not supplied" or
             if (string.Equals(fc, "CF", StringComparison.OrdinalIgnoreCase))
                 _configurationVersion++;
             _version++;
+            RecordChange(reference, fc, isReport
+                ? CanonicalValueChangeKind.Report
+                : CanonicalValueChangeKind.Read);
             return true;
         }
     }
diff --git a/Models/IedBrowserReadBindingIndex.cs b/Models/IedBrowserReadBindingIndex.cs
index 5f2208dba..125a07bfc 100644
--- a/Models/IedBrowserReadBindingIndex.cs
+++ b/Models/IedBrowserReadBindingIndex.cs
@@ -22,7 +22,9 @@ public IedBrowserReadBindingIndex(Iec61850MonitorDevice device)
     {
         _device = device ?? throw new ArgumentNullException(nameof(device));
         var model = device.LiveDiscoveryModel ?? device.SclWorkspace?.DesignModel;
-        var schema = model is null ? null : new IedBrowserSchemaIndex(model);
+        // Same immutable schema instance as IED Browser and future consumers.
+        // Existing synchronous read-binding admission semantics are preserved.
+        var schema = model is null ? null : SharedIedSchemaIndex.GetForBinding(model);
         // Optional, strictly model-proven DO -> process leaf lookup. No
         // first-child heuristics and never borrow another FC's value.
         var signalsByKey = new Dictionary<string, List<SignalDefinition>>(StringComparer.Ordinal);
diff --git a/Models/SharedIedSchemaIndex.cs b/Models/SharedIedSchemaIndex.cs
new file mode 100644
index 000000000..a700e29a0
--- /dev/null
+++ b/Models/SharedIedSchemaIndex.cs
@@ -0,0 +1,60 @@
+using System.Runtime.CompilerServices;
+using AR.Iec61850.Discovery;
+
+namespace ArIED61850Tester.Models;
+
+/// <summary>
+/// One declaration-only IEC 61850 schema index for a concrete immutable model.
+/// Browser, Read projection and future workspace adapters must share the SAME
+/// index instance. Observations, sessions and process values are never stored.
+/// Weak model identity allows replaced discovery/SCL models to be collected.
+/// </summary>
+public static class SharedIedSchemaIndex
+{
+    private static readonly ConditionalWeakTable<LiveIedModelDiscoveryDocument,
+        Lazy<Task<IedBrowserSchemaIndex>>> Models = new();
+
+    /// <summary>
+    /// Thread-safe one-flight index creation off the WPF dispatcher. Calling
+    /// this API only schedules/prepares; it never synchronously walks the model.
+    /// </summary>
+    public static Task<IedBrowserSchemaIndex> PrepareAsync(LiveIedModelDiscoveryDocument model)
+    {
+        ArgumentNullException.ThrowIfNull(model);
+        return Models.GetValue(model, static source =>
+            new Lazy<Task<IedBrowserSchemaIndex>>(
+                () => Task.Run(() => new IedBrowserSchemaIndex(source)),
+                LazyThreadSafetyMode.ExecutionAndPublication)).Value;
+    }
+
+    /// <summary>
+    /// Synchronous compatibility path for existing explicit read binding.
+    /// Reuses the same prepared index; callers on the Dispatcher should prefer
+    /// PrepareAsync and only inspect a successfully completed task.
+    /// </summary>
+    public static IedBrowserSchemaIndex GetForBinding(LiveIedModelDiscoveryDocument model)
+        => PrepareAsync(model).GetAwaiter().GetResult();
+
+    /// <summary>Explicit operator retry only; no background fault-retry storm.</summary>
+    public static void ForgetFaulted(LiveIedModelDiscoveryDocument model)
+    {
+        ArgumentNullException.ThrowIfNull(model);
+        if (Models.TryGetValue(model, out var lazy) &&
+            lazy.IsValueCreated && (lazy.Value.IsFaulted || lazy.Value.IsCanceled))
+            Models.Remove(model);
+    }
+
+    public static bool TryGetPrepared(LiveIedModelDiscoveryDocument model,
+        out IedBrowserSchemaIndex index)
+    {
+        ArgumentNullException.ThrowIfNull(model);
+        if (Models.TryGetValue(model, out var lazy) &&
+            lazy.IsValueCreated && lazy.Value.IsCompletedSuccessfully)
+        {
+            index = lazy.Value.Result;
+            return true;
+        }
+        index = null!;
+        return false;
+    }
+}
diff --git a/P2BlueSteelGreigeUx.cs b/P2BlueSteelGreigeUx.cs
index 26995bf1f..87a504ef1 100644
--- a/P2BlueSteelGreigeUx.cs
+++ b/P2BlueSteelGreigeUx.cs
@@ -16,20 +16,28 @@ namespace ArIED61850Tester;
 /// </summary>
 internal static class P2BlueSteelGreigeUx
 {
-    private static readonly FontFamily PreferredFont =
-        new("Plus Jakarta Sans, Aptos, Segoe UI Variable Text, Segoe UI");
+    // Each WPF window receives its visual adapter exactly once. A later
+    // dialog activation must never restyle the already-visible MainWindow.
+    private static readonly System.Runtime.CompilerServices.ConditionalWeakTable<Window, object>
+        AppliedWindows = new();
 
     public static void ApplyToOpenWindows(Application application)
     {
         ArgumentNullException.ThrowIfNull(application);
 
         foreach (Window window in application.Windows)
+        {
+            if (!window.IsLoaded || AppliedWindows.TryGetValue(window, out _))
+                continue;
             Apply(window);
+            AppliedWindows.Add(window, new object());
+        }
     }
 
     private static void Apply(Window window)
     {
-        window.FontFamily = PreferredFont;
+        // The bundled AppFontFamily (Inter) is the only window typography
+        // authority. A runtime local FontFamily value masked XAML inheritance.
 
         switch (window)
         {
@@ -62,10 +70,8 @@ private static void ApplyMainWindow(MainWindow window)
         }
 
         if (window.FindName("WorkflowPill") is Border workflowPill)
-        {
             workflowPill.CornerRadius = new CornerRadius(9);
-            workflowPill.Height = 36;
-        }
+        // NavigationLayoutFix owns all nav/pill height after construction.
 
         var deviceList = Descendants<ListBox>(window)
             .FirstOrDefault(list => ReferenceEquals(list.ItemsSource, window.Devices));
@@ -78,7 +84,8 @@ private static void ApplyMainWindow(MainWindow window)
 
     private static void ApplyIoFatWindow(IoListTestingWindow window)
     {
-        window.WindowState = WindowState.Maximized;
+        if (window.WindowState != WindowState.Maximized)
+            window.WindowState = WindowState.Maximized;
 
         var fatIedList = Descendants<ListBox>(window)
             .FirstOrDefault(list => ReferenceEquals(list.ItemsSource, window.Project.Ieds));
diff --git a/P2IndustrialWorkstationUx.cs b/P2IndustrialWorkstationUx.cs
index a42a39c40..fa558bda2 100644
--- a/P2IndustrialWorkstationUx.cs
+++ b/P2IndustrialWorkstationUx.cs
@@ -23,6 +23,9 @@ internal static class P2IndustrialWorkstationUx
     private static readonly ConditionalWeakTable<MainWindow, MainSearchState> MainStates = new();
     private static readonly ConditionalWeakTable<IoListTestingWindow, FatSearchState> FatStates = new();
 
+    // Resolve control templates before any visible window is constructed.
+    public static void PreloadResources() => EnsureResources();
+
     public static void Apply(Window window)
     {
         EnsureResources();
@@ -62,13 +65,14 @@ private static void ApplyMain(MainWindow window)
         {
             navShell.CornerRadius = new CornerRadius(6);
             navShell.BorderThickness = new Thickness(1);
-            navShell.Height = 52;
+            // NavigationLayoutFix is the sole authority for shell height.
+            // An activation/Loaded adapter must not fight that layout owner.
         }
 
         if (window.FindName("WorkflowPill") is Border pill)
         {
             pill.CornerRadius = new CornerRadius(5);
-            pill.Height = 34;
+            // Selection pill height is owned by NavigationLayoutFix.
         }
 
         InstallMainIedSearch(window);
diff --git a/Services/UserPreferenceStore.cs b/Services/UserPreferenceStore.cs
index 42d7cb446..e7e5ed885 100644
--- a/Services/UserPreferenceStore.cs
+++ b/Services/UserPreferenceStore.cs
@@ -72,13 +72,11 @@ public sealed record RecentEndpointDetail(
         string IpAddress, int MmsPort, string IedName, bool ConfirmedSuccessful,
         bool WasLastSubmitted = false)
     {
-        public string Subtitle => WasLastSubmitted
-            ? (ConfirmedSuccessful
-                ? $"Last submitted · previously connected · MMS {MmsPort}"
-                : $"Last submitted · connection unverified · MMS {MmsPort}")
+        public string Subtitle => (WasLastSubmitted
+            ? (ConfirmedSuccessful ? "Last entered · Connected before" : "Last entered · Not yet connected")
             : ConfirmedSuccessful
-                ? $"Connected successfully · {(string.IsNullOrWhiteSpace(IedName) ? "IED" : IedName)} · MMS {MmsPort}"
-                : "Saved address · connection unverified";
+                ? (string.IsNullOrWhiteSpace(IedName) ? "Connected before" : $"Connected before · {IedName}")
+                : "Previously saved") + (MmsPort == 102 ? string.Empty : $" · Port {MmsPort}");
     }
 
     // A read-only projection of the EXISTING user preference document.
diff --git a/docs/architecture/UNIFIED_IEC61850_SSOT_V2_2026-10-23.md b/docs/architecture/UNIFIED_IEC61850_SSOT_V2_2026-10-23.md
new file mode 100644
index 000000000..4876579b3
--- /dev/null
+++ b/docs/architecture/UNIFIED_IEC61850_SSOT_V2_2026-10-23.md
@@ -0,0 +1,69 @@
+# ARSAS — Unified IEC 61850 Model / Reactive SSOT v2
+
+**Status:** incremental engineering contract; phase 1 implemented on PR #695; **not released**.
+**Dependency:** PR #688 (SG7 UI budgets, model preparation); includes #679 Smart IP visual startup fixes and #686 SG7 Browser Write/Command Dock. All inherited history must stay intact. **Engine lock remains pinned.**
+
+## One authority, not one mutable UI object
+
+- **Engineering schema**: `LiveDiscoveryModel` / verified SCL, indexed once by immutable **model identity**; exact LD/LN/DO/DA/FC, DataSet member order, RCB and q/t relationships. Source declarations are not live evidence.
+- **Canonical current observation**: `Iec61850MonitorDevice.LiveValues` / `IedBrowserLiveValues` is the per-IED, association-scoped owner for admitted Report and MMS Read observations. Typed q/t evidence and source provenance are never guessed or copied from a display string.
+- **Runtime acquisition**: MMS Report first, association-safe Read/poll fallback according to configured policies. Control requests/results are separate from actual status observations and cannot fabricate process truth.
+- **GOOSE publisher**: a different transport and identity (publisher/stream/DataSet/ordinal). Never write into the MMS identity merely because two labels look alike. A future verified mapper can publish separate GOOSE-origin observations for a *proven* owner/ref/FC; no cross-IED aliasing.
+- **SOE & command lifecycle**: chronological, lossless events. A latest-value dirty-key journal is **not** event history.
+
+```text
+MMS Report ----+
+MMS Read/Poll -+--> canonical admission, exact FC + association ----+
+               |                                                  |
+GOOSE frames --+--> independently verified stream/leaf evidence --+--> source-aware views
+                                                                  |
+                    canonical revision/change journal ------------+--> independent cursors
+                                                                    --> viewport subscription
+                                                                    --> small UI row patches
+
+Immutable engineering model -- shared schema index --+
+                                                      +--> Browser/Explorer/FAT/Command read-only projections
+```
+
+## Implemented now — phase 1
+
+1. `Models/SharedIedSchemaIndex.cs`: `ConditionalWeakTable` keyed by *actual source model*, one `Lazy<Task<IedBrowserSchemaIndex>>` per model. `PrepareAsync` never parses on the WPF Dispatcher. Browser and `IedBrowserReadBindingIndex` share the same instance. The existing binding constructor is synchronous for compatibility, which is a **known future migration point**; don't hide it in FAT results.
+2. `Models/CanonicalValueChangeJournal.cs`: fixed ring of 4096 immutable change records. Records are **only** revision + association + exact reference/FC + channel kind; not process values, samples, or SOE.
+3. `IedBrowserLiveValues.ReadChanges(afterRevision,max)`: independent non-destructive cursor access under the already existing ledger gate. A journal gap, invalid cursor, or association reset triggers `RequiresFullRefresh`. A slow consumer must resync from the canonical ledger before returning to incremental projection. Each accepted canonical publication records a contiguous version; rejected/stale network callbacks emit **nothing**.
+4. Phase-1 tests validate multi-consumer cursor replay, concurrent model preparation identity, reconnect fences and overflow detection.
+5. Original #688 WPF bounded scheduling remains in place, without changing selection, command, Report or SOE semantics.
+
+## Target migration — controlled follow-up phases
+
+**Phase 2: viewport-aware subscriptions / value-only patches**
+
+- Build exact FC-qualified per-IED reference -> consumer/visible-row index, with explicit dependency keys for vectors, parent DO summaries, quality/timestamp, SIUnit/multiplier and RCB readback.
+- When selecting an IED, paint shell immediately, then read **current** canonical values only for visible viewport (+ small overscan). Do not enumerate all SG7 attributes, rebuild all binding rows, or trigger a second MMS scan.
+- Consume the per-workspace cursor in bounded batches. Only changed displayed row fields raise `PropertyChanged`. Offscreen keys mark view versions/dirty state, **not** WPF events.
+- If `RequiresFullRefresh`, reconcile snapshot from the same ledger/model for that IED; preserve scroll, selection and command focus.
+- Preserve separate SOE FIFO, report discontinuities, BufOvfl, q/t typed evidence and control Accepted/Termination ordering.
+
+**Phase 3: shared projection adapter for Explorer, Live Monitor, FAT and Command Dock**
+
+- Delete duplicated ad-hoc presentation caches only *after* proving feature parity.
+- Point and SignalDefinition are UI adapters, **never independent writers of process truth**.
+- Replace per-workspace full CollectionView refresh / dynamic sort with incremental filtered indexes and stable virtualization.
+- Proven GOOSE model binding feeds a **separate source-aware** channel. TTL expiry is freshness state, not a fabricated MMS value change.
+
+**Phase 4: physical FAT / promotion**
+
+- Four concurrently monitored IEDs, including SG7_BCU (~32.9k MMS variables/~25.5k DA); 100 alternating IED switches, selected and unselected; LN/DO open/close, continuous scroll, active Report storm, GOOSE frames, browser read/write, control docks.
+- ETW `ARSAS-IEDBrowser-Performance` + PerfView/WPF Dispatcher, GC allocation, backlog, time-to-first-paint and p50/p95/p99 interaction latency. Record *numbers*, not subjective `feels fast`.
+- Suggested initial gates: p95 selection input feedback <=50 ms; indexed Browser first paint <=150 ms; per UI patch p95 <=4 ms; no application-caused Dispatcher block >50 ms; no stale association, fabricated quality, missing SOE/RCB/control events.
+- Main and release remain gated on exact commit CI + physical FAT. Faster UI **must never** mean dropped protocol evidence or hidden Reads.
+
+## Zero-regression guardrails
+
+- Git branch ancestry must include latest relevant #679/#686/#688, checked at handoff and before merging; no force push.
+- Engine lock must match the qualified ARIEC61850/native-bridge revisions.
+- Do not reimplement MMS, RCB, FCDA identity, q/t parsing, source precedence, SOE or command sequence in a WPF adapter.
+- Publication and version changes are atomic under the current canonical `_gate`. Never call user/WPF event handlers under that gate.
+- Any UI scheduler may coalesce latest **presentation** per key, never chronological events.
+- No feature is called complete on a passing static/source test alone: canonical evidence, source compatibility, peak memory and live multi-IED responsiveness must all be measured.
+
+**Engineering checkpoint:** PR #695 remains draft until Windows CI and later phase-specific SG7_BCU field acceptance evidence are complete.
diff --git a/tests/ARSAS.Tests/FieldRegressionFixTests.cs b/tests/ARSAS.Tests/FieldRegressionFixTests.cs
index 48812ef4e..493f50f26 100644
--- a/tests/ARSAS.Tests/FieldRegressionFixTests.cs
+++ b/tests/ARSAS.Tests/FieldRegressionFixTests.cs
@@ -61,7 +61,11 @@ public void TopBar_ParentContainersCannotClipResponsiveNavigation()
         Assert.Contains("root.ClipToBounds = false", source, StringComparison.Ordinal);
         Assert.Contains("header.ClipToBounds = false", source, StringComparison.Ordinal);
         Assert.Contains("header.MinHeight = 68d", source, StringComparison.Ordinal);
-        Assert.Contains("shell.Height = 64d", source, StringComparison.Ordinal);
+        // NavigationLayoutFix is the sole geometry authority (60px).
+        // The clipping guard may not reassert a competing 64px height.
+        var navigation = File.ReadAllText(FindRepoFile("MainWindow.NavigationLayoutFix.cs"));
+        Assert.Contains("shell.Height = 60;", navigation, StringComparison.Ordinal);
+        Assert.DoesNotContain("shell.Height = 64d", source, StringComparison.Ordinal);
         Assert.Contains("shell.ClipToBounds = false", source, StringComparison.Ordinal);
         Assert.Contains("DispatcherPriority.ContextIdle", source, StringComparison.Ordinal);
     }
diff --git a/tests/ARSAS.Tests/IedTaskDialogVisualRegressionTests.cs b/tests/ARSAS.Tests/IedTaskDialogVisualRegressionTests.cs
index c2133356c..741a53cf5 100644
--- a/tests/ARSAS.Tests/IedTaskDialogVisualRegressionTests.cs
+++ b/tests/ARSAS.Tests/IedTaskDialogVisualRegressionTests.cs
@@ -21,11 +21,20 @@ public void BothDialogs_UseIsolatedHighContrastSurfaceAndBoundedNaturalHeight()
             var document = XDocument.Load(Find(file));
             var root = Assert.IsType<XElement>(document.Root);
             Assert.Equal("Window", root.Name.LocalName);
-            Assert.Equal("Height", (string?)root.Attribute("SizeToContent"));
+            Assert.Equal(file == "IpConnectWizardWindow.xaml" ? "Manual" : "Height",
+                (string?)root.Attribute("SizeToContent"));
             Assert.Equal("TaskDialogCanvas", ResourceRef((string?)root.Attribute("Background"), "DynamicResource"));
-            Assert.True(double.TryParse((string?)root.Attribute("MaxHeight"),
-                NumberStyles.Float, CultureInfo.InvariantCulture, out var max) && max <= 700);
-            Assert.Null(root.Attribute("Height"));
+            if (file == "IpConnectWizardWindow.xaml")
+            {
+                Assert.Equal("350", (string?)root.Attribute("Height"));
+                Assert.Equal("CenterOwner", (string?)root.Attribute("WindowStartupLocation"));
+            }
+            else
+            {
+                Assert.True(double.TryParse((string?)root.Attribute("MaxHeight"),
+                    NumberStyles.Float, CultureInfo.InvariantCulture, out var max) && max <= 700);
+                Assert.Null(root.Attribute("Height"));
+            }
             Assert.Contains(root.Descendants(Presentation + "ResourceDictionary"),
                 element => element.Attribute("Source")?.Value == "Styles/IedTaskDialogStyles.xaml");
             Assert.Contains(root.Descendants(Presentation + "ScrollViewer"),
diff --git a/tests/ARSAS.Tests/PremiumSmartIpWizardTests.cs b/tests/ARSAS.Tests/PremiumSmartIpWizardTests.cs
index f0fa7125f..d1f4c051f 100644
--- a/tests/ARSAS.Tests/PremiumSmartIpWizardTests.cs
+++ b/tests/ARSAS.Tests/PremiumSmartIpWizardTests.cs
@@ -78,6 +78,48 @@ public void ExistingPreferences_SeparateSubmittedFromVerifiedHistory_WithNoMigra
         finally { if (File.Exists(path)) File.Delete(path); }
     }
 
+    [Fact]
+    public void DefaultDialog_IsCompactUsesAppTypography_AndKeepsExpertControlsCollapsed()
+    {
+        var doc = XDocument.Load(Find("IpConnectWizardWindow.xaml"));
+        XNamespace w = "http://schemas.microsoft.com/winfx/2006/xaml/presentation";
+        XNamespace x = "http://schemas.microsoft.com/winfx/2006/xaml";
+        var root = Assert.IsType<XElement>(doc.Root);
+
+        Assert.InRange(int.Parse(root.Attribute("Width")!.Value), 460, 530);
+        Assert.Equal("350", root.Attribute("Height")?.Value);
+        Assert.Contains("AppFontFamily", root.Attribute("FontFamily")!.Value);
+        Assert.Equal("Manual", root.Attribute("SizeToContent")?.Value);
+
+        var octetStyle = doc.Descendants(w + "Style")
+            .Single(style => style.Attribute(x + "Key")?.Value == "SmartIpOctet");
+        var setters = octetStyle.Elements(w + "Setter")
+            .ToDictionary(e => e.Attribute("Property")!.Value, e => e.Attribute("Value")!.Value);
+        Assert.True(double.Parse(setters["Width"], System.Globalization.CultureInfo.InvariantCulture) <= 46);
+        Assert.True(double.Parse(setters["FontSize"], System.Globalization.CultureInfo.InvariantCulture) <= 13);
+        Assert.True(double.Parse(setters["Height"], System.Globalization.CultureInfo.InvariantCulture) <= 34);
+
+        var options = doc.Descendants(w + "Expander")
+            .Single(e => e.Attribute(x + "Name")?.Value == "MoreOptionsExpander");
+        Assert.NotEqual("True", options.Attribute("IsExpanded")?.Value);
+        Assert.Contains(options.Descendants(w + "TextBox"),
+            box => box.Attribute(x + "Name")?.Value == "MmsPortBox");
+        Assert.DoesNotContain(doc.Descendants(w + "CheckBox"),
+            box => box.Attribute(x + "Name")?.Value == "ManualAddressCheck");
+        Assert.Equal("265", doc.Descendants(w + "Border")
+            .Single(e => e.Attribute(x + "Name")?.Value == "IpEditorHost")
+            .Attribute("Width")?.Value);
+        Assert.Contains("expand_circle_down", File.ReadAllText(Find("IpConnectWizardWindow.xaml")));
+
+        var xaml = File.ReadAllText(Find("IpConnectWizardWindow.xaml"));
+        Assert.DoesNotContain("Smart discovery", xaml, StringComparison.Ordinal);
+        Assert.DoesNotContain("DataSets", xaml, StringComparison.Ordinal);
+        Assert.DoesNotContain("RCBs", xaml, StringComparison.Ordinal);
+        Assert.DoesNotContain("IPv6", xaml, StringComparison.Ordinal);
+        Assert.Contains("x:Name=\"HistoryPopup\"", xaml, StringComparison.Ordinal);
+        Assert.Contains("Content=\"Connect\"", xaml, StringComparison.Ordinal);
+    }
+
     [Fact]
     public void WpfEditor_ConstructsOnSta_AndHasReachableKeyboardFocusAndIPv6Mode()
     {
@@ -112,18 +154,25 @@ public void WpfEditor_ConstructsOnSta_AndHasReachableKeyboardFocusAndIPv6Mode()
                     FocusManager.SetFocusedElement(wizard, boxes[0]);
                     Assert.Same(boxes[0], FocusManager.GetFocusedElement(wizard));
 
-                    var advanced = Assert.IsType<CheckBox>(wizard.FindName("ManualAddressCheck"));
+                    var options = Assert.IsType<Expander>(wizard.FindName("MoreOptionsExpander"));
+                    Assert.False(options.IsExpanded);
                     var raw = Assert.IsType<TextBox>(wizard.FindName("RawIpBox"));
                     var host = Assert.IsType<Border>(wizard.FindName("IpEditorHost"));
-                    var mode = typeof(IpConnectWizardWindow).GetMethod(
-                        "ManualAddressCheck_Click", BindingFlags.Instance | BindingFlags.NonPublic);
-                    Assert.NotNull(mode);
-                    advanced.IsChecked = true;
-                    mode.Invoke(wizard, [advanced, new RoutedEventArgs()]);
-                    Assert.Equal(Visibility.Visible, raw.Visibility);
-                    Assert.Equal(Visibility.Collapsed, host.Visibility);
-                    raw.Text = "2001:db8::2";
-                    Assert.True(System.Net.IPAddress.TryParse(raw.Text, out _));
+                    Assert.Equal(Visibility.Collapsed, raw.Visibility);
+                    Assert.Equal(Visibility.Visible, host.Visibility);
+                    Assert.Null(wizard.FindName("ManualAddressCheck"));
+
+                    // IPv6 has no visible toggle; it activates via the caller's
+                    // initial address or a history recall, without losing data.
+                    var ipv6Wizard = new IpConnectWizardWindow("2001:db8::2");
+                    try
+                    {
+                        Assert.Equal(Visibility.Visible,
+                            Assert.IsType<TextBox>(ipv6Wizard.FindName("RawIpBox")).Visibility);
+                        Assert.Equal(Visibility.Collapsed,
+                            Assert.IsType<Border>(ipv6Wizard.FindName("IpEditorHost")).Visibility);
+                    }
+                    finally { ipv6Wizard.Close(); }
 
                     Assert.NotNull(wizard.FindName("HistorySearchBox"));
                     Assert.NotNull(wizard.FindName("HistoryListBox"));
diff --git a/tests/ARSAS.Tests/StartupVisualStabilityRegressionTests.cs b/tests/ARSAS.Tests/StartupVisualStabilityRegressionTests.cs
new file mode 100644
index 000000000..ee0f54d2c
--- /dev/null
+++ b/tests/ARSAS.Tests/StartupVisualStabilityRegressionTests.cs
@@ -0,0 +1,114 @@
+using System.Xml.Linq;
+
+namespace ARSAS.Tests;
+
+/// <summary>
+/// Source-level ownership checks for the first-paint startup path. These tests
+/// complement, not replace, a physical 100/125/150% DPI visual screenshot check.
+/// </summary>
+public sealed class StartupVisualStabilityRegressionTests
+{
+    [Fact]
+    public void Startup_ThemeAndIndustrialTemplatesPrecedeFirstWindow()
+    {
+        var app = Read("App.xaml.cs");
+        var theme = app.IndexOf("InstallP2BlueSteelGreigeTheme();", StringComparison.Ordinal);
+        var fascia = app.IndexOf("InstallArvrelMiniIedFascia();", StringComparison.Ordinal);
+        var controls = app.IndexOf("P2IndustrialWorkstationUx.PreloadResources();", StringComparison.Ordinal);
+        var registration = app.IndexOf("EventManager.RegisterClassHandler(typeof(Window)", StringComparison.Ordinal);
+        Assert.True(theme >= 0 && fascia > theme && controls > fascia);
+        Assert.True(registration > controls);
+        Assert.Contains("private void AppWindow_Loaded", app, StringComparison.Ordinal);
+        Assert.Contains("_styledWindows.TryGetValue(window", app, StringComparison.Ordinal);
+
+        // Every focus return must not redo the entire WPF visual tree.
+        Assert.DoesNotContain("protected override void OnActivated(", app, StringComparison.Ordinal);
+    }
+
+    [Fact]
+    public void WindowAdapter_IsOnceOnlyAndNeverOverridesCanonicalInterFont()
+    {
+        var adapter = Read("P2BlueSteelGreigeUx.cs");
+        var controls = Read("P2IndustrialWorkstationUx.cs");
+        var app = Read("App.xaml");
+
+        Assert.Contains("ConditionalWeakTable<Window, object>", adapter, StringComparison.Ordinal);
+        Assert.Contains("AppliedWindows.TryGetValue", adapter, StringComparison.Ordinal);
+        Assert.Contains("AppliedWindows.Add", adapter, StringComparison.Ordinal);
+        Assert.DoesNotContain("window.FontFamily =", adapter, StringComparison.Ordinal);
+        Assert.DoesNotContain("Plus Jakarta Sans", adapter, StringComparison.Ordinal);
+        Assert.Contains("./Assets/Fonts/#Inter", app, StringComparison.Ordinal);
+        Assert.Contains("PreloadResources() => EnsureResources()", controls, StringComparison.Ordinal);
+    }
+
+    [Fact]
+    public void ResponsiveNavigation_OwnsShellHeight_WithoutLateClobber()
+    {
+        var main = XDocument.Parse(Read("MainWindow.xaml"));
+        Assert.Equal("Maximized", (string?)main.Root?.Attribute("WindowState"));
+
+        var responsive = Read("MainWindow.NavigationLayoutFix.cs");
+        var p2 = Read("P2IndustrialWorkstationUx.cs");
+        var guard = Read("MainWindow.TopBarContainerHardening.cs");
+
+        Assert.Contains("shell.Height = 60;", responsive, StringComparison.Ordinal);
+        Assert.DoesNotContain("navShell.Height = 52;", p2, StringComparison.Ordinal);
+        Assert.DoesNotContain("shell.Height = 64d;", guard, StringComparison.Ordinal);
+        Assert.DoesNotContain("shell.Padding = new Thickness(5, 7, 5, 7);", guard,
+            StringComparison.Ordinal);
+        Assert.Contains("header.MinHeight = 68d;", guard, StringComparison.Ordinal);
+    }
+
+    [Fact]
+    public void IpDialog_UsesSingleInputSurfaceAndLowNoiseAdvancedDisclosure()
+    {
+        var source = Read("IpConnectWizardWindow.xaml");
+        var doc = XDocument.Parse(source);
+        XNamespace presentation = "http://schemas.microsoft.com/winfx/2006/xaml/presentation";
+        XNamespace xaml = "http://schemas.microsoft.com/winfx/2006/xaml";
+        Assert.InRange(int.Parse(doc.Root!.Attribute("Width")!.Value), 460, 490);
+
+        var host = doc.Descendants(presentation + "Border")
+            .Single(node => node.Attribute(xaml + "Name")?.Value == "IpEditorHost");
+        Assert.Equal("43", (string?)host.Attribute("Height"));
+        Assert.Equal("265", (string?)host.Attribute("Width"));
+        Assert.Equal("Manual", (string?)doc.Root.Attribute("SizeToContent"));
+        Assert.Equal("350", (string?)doc.Root.Attribute("Height"));
+        Assert.DoesNotContain("ManualAddressCheck", source, StringComparison.Ordinal);
+
+        var editor = doc.Descendants(presentation + "StackPanel")
+            .Single(node => node.Attribute(xaml + "Name")?.Value == "OctetEditor");
+        Assert.Equal("Center", (string?)editor.Attribute("HorizontalAlignment"));
+
+        var popup = doc.Descendants(presentation + "Popup")
+            .Single(node => node.Attribute(xaml + "Name")?.Value == "HistoryPopup");
+        Assert.Contains("ActualWidth", popup.Descendants(presentation + "Border")
+            .First().Attribute("Width")!.Value, StringComparison.Ordinal);
+
+        var disclosure = doc.Descendants(presentation + "Style")
+            .Single(node => node.Attribute(xaml + "Key")?.Value == "SmartIpOptionsExpander");
+        Assert.Contains("ToggleButton", disclosure.ToString(), StringComparison.Ordinal);
+        Assert.Contains("IsExpanded", disclosure.ToString(), StringComparison.Ordinal);
+        Assert.DoesNotContain("Smart discovery", source, StringComparison.Ordinal);
+        Assert.DoesNotContain("TaskDialogCardStyle", source, StringComparison.Ordinal);
+        Assert.DoesNotContain("IPv6", source, StringComparison.Ordinal);
+        Assert.Contains("Content=\"Connect\"", source, StringComparison.Ordinal);
+
+        var behavior = Read("IpConnectWizardWindow.xaml.cs");
+        Assert.Contains("if (selection.MmsPort != 102)", behavior, StringComparison.Ordinal);
+        Assert.Contains("if (selectedPort != 102)", behavior, StringComparison.Ordinal);
+    }
+
+    private static string Read(string relative)
+    {
+        DirectoryInfo? directory = new(AppContext.BaseDirectory);
+        while (directory is not null)
+        {
+            var candidate = Path.Combine(directory.FullName, relative);
+            if (File.Exists(candidate))
+                return File.ReadAllText(candidate);
+            directory = directory.Parent;
+        }
+        throw new FileNotFoundException(relative);
+    }
+}
diff --git a/tests/ARSAS.Tests/UnifiedSsotV2Phase1Tests.cs b/tests/ARSAS.Tests/UnifiedSsotV2Phase1Tests.cs
new file mode 100644
index 000000000..ca4ce7f0b
--- /dev/null
+++ b/tests/ARSAS.Tests/UnifiedSsotV2Phase1Tests.cs
@@ -0,0 +1,135 @@
+using AR.Iec61850.Discovery;
+using ArIED61850Tester.Models;
+
+namespace ARSAS.Tests;
+
+/// <summary>
+/// Foundation contracts for multiple workspaces observing one canonical value
+/// owner and one immutable engineering schema. No physical IED is required.
+/// </summary>
+public sealed class UnifiedSsotV2Phase1Tests
+{
+    [Fact]
+    public async Task ModelSchema_IsOneFlightAcrossBrowserAndReadBindings()
+    {
+        var one = new LiveIedModelDiscoveryDocument();
+        var another = new LiveIedModelDiscoveryDocument();
+        var builds = Enumerable.Range(0, 48)
+            .Select(_ => SharedIedSchemaIndex.PrepareAsync(one))
+            .ToArray();
+
+        Assert.All(builds, build => Assert.Same(builds[0], build));
+        var index = await builds[0];
+        Assert.Same(one, index.SourceModel);
+        Assert.True(SharedIedSchemaIndex.TryGetPrepared(one, out var prepared));
+        Assert.Same(index, prepared);
+        Assert.Same(index, SharedIedSchemaIndex.GetForBinding(one));
+        Assert.NotSame(index, await SharedIedSchemaIndex.PrepareAsync(another));
+        SharedIedSchemaIndex.ForgetFaulted(one);
+        Assert.Same(index, await SharedIedSchemaIndex.PrepareAsync(one));
+    }
+
+    [Fact]
+    public void CanonicalDirtyKeys_AreIndependentForTwoWorkspaceCursors()
+    {
+        var store = new IedBrowserLiveValues();
+        var association = store.BeginAssociation();
+        var initial = store.ReadChanges(0);
+        Assert.True(initial.RequiresFullRefresh);
+        Assert.Contains(initial.Changes, c =>
+            c.Kind == CanonicalValueChangeKind.AssociationInvalidated);
+        var cursor = store.Version;
+
+        const string point = "SG7LD/MMXU1.A.phsA.cVal.mag.f";
+        Assert.True(store.PublishForAssociation(association,
+            point, "mx", "123.4", "Good", "12:01", "Report"));
+        Assert.True(store.PublishForAssociation(association,
+            "SG7LD/XCBR1.Pos.stVal", "ST", "true", "Good", "12:01", "Report"));
+        Assert.True(store.PublishForAssociation(association,
+            "SG7LD/LLN0.Mod.stVal", "ST", "1", "", "", "MMS Read"));
+
+        // No drain: the same publication is independently readable by Browser
+        // and Live Monitor without copying a second authoritative value store.
+        var browser = store.ReadChanges(cursor, 2);
+        var explorer = store.ReadChanges(cursor, 2);
+        Assert.False(browser.RequiresFullRefresh);
+        Assert.Equal(browser.ThroughRevision, explorer.ThroughRevision);
+        Assert.Equal(browser.LatestRevision, explorer.LatestRevision);
+        Assert.Equal(browser.Changes.ToArray(), explorer.Changes.ToArray());
+        Assert.Equal(2, browser.Changes.Count);
+        Assert.Equal(cursor + 2, browser.ThroughRevision);
+        Assert.Equal(store.Version, browser.LatestRevision);
+        Assert.Equal(point, browser.Changes[0].Reference);
+        Assert.Equal("MX", browser.Changes[0].FunctionalConstraint);
+        Assert.Equal(CanonicalValueChangeKind.Report, browser.Changes[0].Kind);
+
+        var continuation = store.ReadChanges(browser.ThroughRevision, 2);
+        Assert.Single(continuation.Changes);
+        Assert.Equal(CanonicalValueChangeKind.Read, continuation.Changes[0].Kind);
+        Assert.True(store.TryGet(point, "MX", out var evidence));
+        Assert.Equal("123.4", evidence.Value);
+        Assert.Equal(association, evidence.Association);
+    }
+
+    [Fact]
+    public void ChangeJournal_RejectsStaleAssociationAndSignalsReset()
+    {
+        var store = new IedBrowserLiveValues();
+        var first = store.BeginAssociation();
+        var cursor = store.Version;
+        Assert.True(store.PublishForAssociation(first, "LD/XCBR1.Pos.stVal",
+            "ST", "true", "", "", "Report"));
+        store.MarkOffline();
+        var delta = store.ReadChanges(cursor);
+        Assert.True(delta.RequiresFullRefresh);
+        Assert.Equal(CanonicalValueChangeKind.AssociationInvalidated,
+            delta.Changes[^1].Kind);
+        Assert.False(store.PublishForAssociation(first, "LD/XCBR1.Pos.stVal",
+            "ST", "false", "", "", "Report"));
+        var next = store.BeginAssociation();
+        Assert.True(next > first);
+        Assert.False(store.TryGet("LD/XCBR1.Pos.stVal", "ST", out _));
+        Assert.True(store.ReadChanges(cursor).RequiresFullRefresh);
+    }
+
+    [Fact]
+    public void BoundedJournal_DetectsMissedRevisionsRatherThanHidingChanges()
+    {
+        var store = new IedBrowserLiveValues();
+        var association = store.BeginAssociation();
+        var veryOldCursor = store.Version;
+        for (var i = 0; i < 4300; i++)
+            Assert.True(store.PublishForAssociation(association,
+                "LD/MMXU1.A.phsA.cVal.mag.f", "MX", i.ToString(), "", "", "Report"));
+        var result = store.ReadChanges(veryOldCursor, 32);
+        Assert.True(result.RequiresFullRefresh);
+        Assert.Empty(result.Changes);
+        Assert.Equal(store.Version, result.ThroughRevision);
+        Assert.Empty(store.ReadChanges(store.Version).Changes);
+    }
+
+    [Fact]
+    public void ReadAndBrowser_UseSharedSchemaFactoryAndCanonicalMutationJournal()
+    {
+        var binding = Read("Models/IedBrowserReadBindingIndex.cs");
+        var browser = Read("MainWindow.IedBrowser.Performance.cs");
+        var ledger = Read("Models/IedBrowserLiveValues.cs");
+        Assert.Contains("SharedIedSchemaIndex.GetForBinding(model)", binding);
+        Assert.Contains("SharedIedSchemaIndex.PrepareAsync(model)", browser);
+        Assert.DoesNotContain("new IedBrowserSchemaIndex(model)", binding);
+        Assert.Contains("RecordChange(reference, fc, isReport", ledger);
+        Assert.Contains("CanonicalValueChangeKind.ReportCompanion", ledger);
+        Assert.Contains("CanonicalValueChangeKind.AssociationInvalidated", ledger);
+    }
+
+    private static string Read(string filename)
+    {
+        for (DirectoryInfo? dir = new(AppContext.BaseDirectory);
+             dir is not null; dir = dir.Parent)
+        {
+            var path = Path.Combine(dir.FullName, filename);
+            if (File.Exists(path)) return File.ReadAllText(path);
+        }
+        throw new FileNotFoundException(filename);
+    }
+}