diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index e7629e44..dee83cf3 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -24,7 +24,7 @@ jobs:
         shell: powershell
         run: .\ArIED61850Tester\scripts\verify-source-clean.ps1
 
-      - name: Verify premium P0 and P1 UX invariants
+      - name: Verify premium P0, P1 and P2 UX invariants
         shell: powershell
         run: |
           $app = Get-Content .\ArIED61850Tester\App.xaml -Raw
@@ -76,6 +76,12 @@ jobs:
           if ($main -notmatch 'LucideRefreshCw' -or $main -notmatch 'HorizontalAlignment="Center"') {
             throw "Premium Lucide icon or centered IED card layout invariant was not found."
           }
+          if ($app -notmatch 'x:Key="SurfaceColor"' -or
+              $app -notmatch 'x:Key="BorderStrongColor"' -or
+              $app -notmatch 'x:Key="BodyText"' -or
+              $app -notmatch 'x:Key="MicroLabel"') {
+            throw "P2 semantic theme tokens or compact typography scale were not found."
+          }
 
       - name: Upload source snapshot
         uses: actions/upload-artifact@v4
@@ -153,7 +159,7 @@ jobs:
 
       - name: Publish portable x64
         shell: powershell
-        run: .\ArIED61850Tester\scripts\publish-windows-portable.ps1 -Version 1.6.12 -EngineProject "$env:GITHUB_WORKSPACE\ARIEC61850\src\AR.Iec61850\AR.Iec61850.csproj"
+        run: .\ArIED61850Tester\scripts\publish-windows-portable.ps1 -Version 1.6.13 -EngineProject "$env:GITHUB_WORKSPACE\ARIEC61850\src\AR.Iec61850\AR.Iec61850.csproj"
 
       - name: Upload portable package
         uses: actions/upload-artifact@v4
diff --git a/App.xaml b/App.xaml
index 79e31ecd..10aa5314 100644
--- a/App.xaml
+++ b/App.xaml
@@ -9,7 +9,15 @@
         <Color x:Key="AccentDeepColor">#1D4ED8</Color>
         <Color x:Key="SoftBlueColor">#EAF1FF</Color>
         <Color x:Key="BgColor">#EEF3F9</Color>
-        <Color x:Key="LineColor">#E5EAF3</Color>
+        <Color x:Key="LineColor">#DDE5F0</Color>
+        <!-- P2 semantic theme tokens: one source of truth for compact engineering surfaces and states. -->
+        <Color x:Key="SurfaceColor">#F8FAFD</Color>
+        <Color x:Key="SurfaceElevatedColor">#FFFFFF</Color>
+        <Color x:Key="BorderSubtleColor">#DDE5F0</Color>
+        <Color x:Key="BorderStrongColor">#B9C8DC</Color>
+        <Color x:Key="SuccessColor">#15803D</Color>
+        <Color x:Key="DangerColor">#DC2626</Color>
+        <Color x:Key="WarningColor">#D97706</Color>
 
         <SolidColorBrush x:Key="Ink" Color="{StaticResource InkColor}"/>
         <SolidColorBrush x:Key="Muted" Color="{StaticResource MutedColor}"/>
@@ -18,16 +26,23 @@
         <SolidColorBrush x:Key="SoftBlue" Color="{StaticResource SoftBlueColor}"/>
         <SolidColorBrush x:Key="Bg" Color="{StaticResource BgColor}"/>
         <SolidColorBrush x:Key="Line" Color="{StaticResource LineColor}"/>
-        <SolidColorBrush x:Key="Panel" Color="#FFFFFF"/>
+        <SolidColorBrush x:Key="Surface" Color="{StaticResource SurfaceColor}"/>
+        <SolidColorBrush x:Key="SurfaceElevated" Color="{StaticResource SurfaceElevatedColor}"/>
+        <SolidColorBrush x:Key="BorderSubtle" Color="{StaticResource BorderSubtleColor}"/>
+        <SolidColorBrush x:Key="BorderStrong" Color="{StaticResource BorderStrongColor}"/>
+        <SolidColorBrush x:Key="Success" Color="{StaticResource SuccessColor}"/>
+        <SolidColorBrush x:Key="Danger" Color="{StaticResource DangerColor}"/>
+        <SolidColorBrush x:Key="Warning" Color="{StaticResource WarningColor}"/>
+        <SolidColorBrush x:Key="Panel" Color="{StaticResource SurfaceElevatedColor}"/>
         <SolidColorBrush x:Key="RowHover" Color="#F4F8FF"/>
         <SolidColorBrush x:Key="RowSelected" Color="#EAF2FF"/>
         <SolidColorBrush x:Key="RowSelectedBorder" Color="#C7DAFF"/>
 
         <!-- Premium surface hierarchy. Gradients remain subtle so dense engineering data stays readable. -->
         <LinearGradientBrush x:Key="AppBackgroundGradient" StartPoint="0,0" EndPoint="1,1">
-            <GradientStop Color="#EAF0F8" Offset="0"/>
-            <GradientStop Color="#F5F8FC" Offset="0.55"/>
-            <GradientStop Color="#EDF3FA" Offset="1"/>
+            <GradientStop Color="#E8EEF7" Offset="0"/>
+            <GradientStop Color="#F3F7FC" Offset="0.52"/>
+            <GradientStop Color="#EAF1F9" Offset="1"/>
         </LinearGradientBrush>
         <LinearGradientBrush x:Key="PremiumSurface" StartPoint="0,0" EndPoint="1,1">
             <GradientStop Color="#FFFFFF" Offset="0"/>
@@ -56,16 +71,16 @@
         </LinearGradientBrush>
         <LinearGradientBrush x:Key="IedCardHover" StartPoint="0,0" EndPoint="1,1">
             <GradientStop Color="#FFFFFF" Offset="0"/>
-            <GradientStop Color="#EAF3FF" Offset="1"/>
+            <GradientStop Color="#E5F0FF" Offset="1"/>
         </LinearGradientBrush>
         <LinearGradientBrush x:Key="IedCardSelected" StartPoint="0,0" EndPoint="1,1">
             <GradientStop Color="#F7FBFF" Offset="0"/>
-            <GradientStop Color="#DCEAFF" Offset="1"/>
+            <GradientStop Color="#D5E6FF" Offset="1"/>
         </LinearGradientBrush>
         <LinearGradientBrush x:Key="IedCardConnected" StartPoint="0,0" EndPoint="1,1">
             <GradientStop Color="#FFFFFF" Offset="0"/>
             <GradientStop Color="#F0FBF5" Offset="0.68"/>
-            <GradientStop Color="#E4F7ED" Offset="1"/>
+            <GradientStop Color="#DDF5E8" Offset="1"/>
         </LinearGradientBrush>
         <LinearGradientBrush x:Key="IedCardConnectedSelected" StartPoint="0,0" EndPoint="1,1">
             <GradientStop Color="#F8FFFB" Offset="0"/>
@@ -146,15 +161,31 @@
             </Setter>
         </Style>
 
+        <!-- Compact P2 typography scale: restrained sizes for dense engineering workstations. -->
         <Style x:Key="SectionTitle" TargetType="TextBlock">
-            <Setter Property="FontSize" Value="16"/>
+            <Setter Property="FontSize" Value="15"/>
             <Setter Property="FontWeight" Value="SemiBold"/>
             <Setter Property="Foreground" Value="{StaticResource Ink}"/>
+            <Setter Property="TextOptions.TextFormattingMode" Value="Display"/>
+        </Style>
+
+        <Style x:Key="BodyText" TargetType="TextBlock">
+            <Setter Property="FontSize" Value="12.2"/>
+            <Setter Property="Foreground" Value="{StaticResource Ink}"/>
+            <Setter Property="TextOptions.TextFormattingMode" Value="Display"/>
         </Style>
 
         <Style x:Key="Caption" TargetType="TextBlock">
             <Setter Property="Foreground" Value="{StaticResource Muted}"/>
-            <Setter Property="FontSize" Value="12.5"/>
+            <Setter Property="FontSize" Value="11.8"/>
+            <Setter Property="TextOptions.TextFormattingMode" Value="Display"/>
+        </Style>
+
+        <Style x:Key="MicroLabel" TargetType="TextBlock">
+            <Setter Property="Foreground" Value="{StaticResource Muted}"/>
+            <Setter Property="FontSize" Value="10.6"/>
+            <Setter Property="FontWeight" Value="SemiBold"/>
+            <Setter Property="TextOptions.TextFormattingMode" Value="Display"/>
         </Style>
 
         <Style x:Key="PrimaryButton" TargetType="Button">
@@ -185,32 +216,10 @@
                         <ControlTemplate.Triggers>
                             <Trigger Property="IsMouseOver" Value="True">
                                 <Setter TargetName="Chrome" Property="Background" Value="{StaticResource AccentDeep}"/>
-                                <Trigger.EnterActions>
-                                    <BeginStoryboard>
-                                        <Storyboard>
-                                            <DoubleAnimation Storyboard.TargetName="Chrome" Storyboard.TargetProperty="(UIElement.RenderTransform).(ScaleTransform.ScaleX)" To="1.018" Duration="0:0:0.14">
-                                                <DoubleAnimation.EasingFunction><CubicEase EasingMode="EaseOut"/></DoubleAnimation.EasingFunction>
-                                            </DoubleAnimation>
-                                            <DoubleAnimation Storyboard.TargetName="Chrome" Storyboard.TargetProperty="(UIElement.RenderTransform).(ScaleTransform.ScaleY)" To="1.018" Duration="0:0:0.14">
-                                                <DoubleAnimation.EasingFunction><CubicEase EasingMode="EaseOut"/></DoubleAnimation.EasingFunction>
-                                            </DoubleAnimation>
-                                        </Storyboard>
-                                    </BeginStoryboard>
-                                </Trigger.EnterActions>
-                                <Trigger.ExitActions>
-                                    <BeginStoryboard>
-                                        <Storyboard>
-                                            <DoubleAnimation Storyboard.TargetName="Chrome" Storyboard.TargetProperty="(UIElement.RenderTransform).(ScaleTransform.ScaleX)" To="1" Duration="0:0:0.17"/>
-                                            <DoubleAnimation Storyboard.TargetName="Chrome" Storyboard.TargetProperty="(UIElement.RenderTransform).(ScaleTransform.ScaleY)" To="1" Duration="0:0:0.17"/>
-                                        </Storyboard>
-                                    </BeginStoryboard>
-                                </Trigger.ExitActions>
+                                <Setter TargetName="Chrome" Property="Opacity" Value="0.96"/>
                             </Trigger>
                             <Trigger Property="IsPressed" Value="True">
-                                <Setter TargetName="Chrome" Property="Opacity" Value="0.94"/>
-                                <Setter TargetName="Chrome" Property="RenderTransform">
-                                    <Setter.Value><ScaleTransform ScaleX="0.982" ScaleY="0.982"/></Setter.Value>
-                                </Setter>
+                                <Setter TargetName="Chrome" Property="Opacity" Value="0.84"/>
                             </Trigger>
                             <Trigger Property="IsEnabled" Value="False">
                                 <Setter TargetName="Chrome" Property="Opacity" Value="0.55"/>
@@ -250,28 +259,10 @@
                         <ControlTemplate.Triggers>
                             <Trigger Property="IsMouseOver" Value="True">
                                 <Setter TargetName="Chrome" Property="Background" Value="#E1EAFE"/>
-                                <Trigger.EnterActions>
-                                    <BeginStoryboard>
-                                        <Storyboard>
-                                            <DoubleAnimation Storyboard.TargetName="Chrome" Storyboard.TargetProperty="(UIElement.RenderTransform).(ScaleTransform.ScaleX)" To="1.012" Duration="0:0:0.14"/>
-                                            <DoubleAnimation Storyboard.TargetName="Chrome" Storyboard.TargetProperty="(UIElement.RenderTransform).(ScaleTransform.ScaleY)" To="1.012" Duration="0:0:0.14"/>
-                                        </Storyboard>
-                                    </BeginStoryboard>
-                                </Trigger.EnterActions>
-                                <Trigger.ExitActions>
-                                    <BeginStoryboard>
-                                        <Storyboard>
-                                            <DoubleAnimation Storyboard.TargetName="Chrome" Storyboard.TargetProperty="(UIElement.RenderTransform).(ScaleTransform.ScaleX)" To="1" Duration="0:0:0.17"/>
-                                            <DoubleAnimation Storyboard.TargetName="Chrome" Storyboard.TargetProperty="(UIElement.RenderTransform).(ScaleTransform.ScaleY)" To="1" Duration="0:0:0.17"/>
-                                        </Storyboard>
-                                    </BeginStoryboard>
-                                </Trigger.ExitActions>
+                                <Setter TargetName="Chrome" Property="BorderBrush" Value="{StaticResource BorderStrong}"/>
                             </Trigger>
                             <Trigger Property="IsPressed" Value="True">
-                                <Setter TargetName="Chrome" Property="Opacity" Value="0.94"/>
-                                <Setter TargetName="Chrome" Property="RenderTransform">
-                                    <Setter.Value><ScaleTransform ScaleX="0.984" ScaleY="0.984"/></Setter.Value>
-                                </Setter>
+                                <Setter TargetName="Chrome" Property="Opacity" Value="0.82"/>
                             </Trigger>
                             <Trigger Property="IsEnabled" Value="False">
                                 <Setter TargetName="Chrome" Property="Opacity" Value="0.55"/>
@@ -394,15 +385,11 @@
                         <ControlTemplate.Triggers>
                             <Trigger Property="IsMouseOver" Value="True">
                                 <Setter TargetName="Chrome" Property="Background" Value="#FFFFFF"/>
-                                <Setter TargetName="Chrome" Property="BorderBrush" Value="#9CB8E8"/>
-                                <Setter TargetName="Chrome" Property="RenderTransform">
-                                    <Setter.Value><ScaleTransform ScaleX="1.06" ScaleY="1.06"/></Setter.Value>
-                                </Setter>
+                                <Setter TargetName="Chrome" Property="BorderBrush" Value="#8EAFE3"/>
                             </Trigger>
                             <Trigger Property="IsPressed" Value="True">
-                                <Setter TargetName="Chrome" Property="RenderTransform">
-                                    <Setter.Value><ScaleTransform ScaleX="0.94" ScaleY="0.94"/></Setter.Value>
-                                </Setter>
+                                <Setter TargetName="Chrome" Property="Background" Value="#E7F0FF"/>
+                                <Setter TargetName="Chrome" Property="Opacity" Value="0.82"/>
                             </Trigger>
                             <Trigger Property="IsEnabled" Value="False">
                                 <Setter TargetName="Chrome" Property="Opacity" Value="0.32"/>
diff --git a/ArIED61850Tester.csproj b/ArIED61850Tester.csproj
index ec0ac89d..1fa43bee 100644
--- a/ArIED61850Tester.csproj
+++ b/ArIED61850Tester.csproj
@@ -14,9 +14,9 @@
     <Product>ArIED 61850</Product>
     <AssemblyTitle>ArIED 61850 — IEC 61850 Engineering Workstation</AssemblyTitle>
     <Description>Windows IEC 61850 engineering workstation for SCL-assisted project setup, interoperable Edition 1/2 SCL export, live MMS model discovery, independent multi-IED monitoring, reporting diagnostics, sequence of events, and guarded Smart Control.</Description>
-    <Version>1.6.12</Version>
-    <AssemblyVersion>1.6.12.0</AssemblyVersion>
-    <FileVersion>1.6.12.0</FileVersion>
+    <Version>1.6.13</Version>
+    <AssemblyVersion>1.6.13.0</AssemblyVersion>
+    <FileVersion>1.6.13.0</FileVersion>
     <PackageTags>iec61850;iec-61850;mms;scl;ied-explorer;multi-ied-monitoring;relay-testing;substation-automation;digital-substation;report-control-block;sequence-of-events;smart-control;wpf;dotnet</PackageTags>
     <PackageLicenseExpression>GPL-3.0-or-later</PackageLicenseExpression>
     <ArIec61850Project Condition="'$(ArIec61850Project)' == '' and '$(ARIEC61850_PROJECT)' != ''">$(ARIEC61850_PROJECT)</ArIec61850Project>
diff --git a/MainWindow.xaml b/MainWindow.xaml
index c2e085b8..00e07e76 100644
--- a/MainWindow.xaml
+++ b/MainWindow.xaml
@@ -60,13 +60,13 @@
             </Border>
 
             <WrapPanel Grid.Column="2" HorizontalAlignment="Right" VerticalAlignment="Center">
-                <Border Background="White" BorderBrush="{StaticResource Line}" BorderThickness="1" CornerRadius="15" Padding="10,6" Margin="0,0,8,0">
+                <Border Background="{StaticResource PremiumSurface}" BorderBrush="{StaticResource BorderSubtle}" BorderThickness="1" CornerRadius="15" Padding="10,6" Margin="0,0,8,0">
                     <TextBlock Text="{Binding ConnectionInsightText}" FontSize="12.5" Foreground="{StaticResource Ink}"/>
                 </Border>
-                <Border Background="White" BorderBrush="{StaticResource Line}" BorderThickness="1" CornerRadius="15" Padding="10,6" Margin="0,0,8,0">
+                <Border Background="{StaticResource PremiumSurface}" BorderBrush="{StaticResource BorderSubtle}" BorderThickness="1" CornerRadius="15" Padding="10,6" Margin="0,0,8,0">
                     <TextBlock Text="{Binding MonitoringInsightText}" FontSize="12.5" Foreground="{StaticResource Ink}"/>
                 </Border>
-                <Border Background="White" BorderBrush="{StaticResource Line}" BorderThickness="1" CornerRadius="15" Padding="10,6">
+                <Border Background="{StaticResource PremiumSurface}" BorderBrush="{StaticResource BorderSubtle}" BorderThickness="1" CornerRadius="15" Padding="10,6">
                     <TextBlock Text="{Binding EventInsightText}" FontSize="12.5" Foreground="{StaticResource Ink}"/>
                 </Border>
             </WrapPanel>
@@ -93,7 +93,7 @@
                                 </Grid.ColumnDefinitions>
                                 <StackPanel Orientation="Horizontal">
                                     <Ellipse Width="8" Height="8" Fill="{StaticResource Accent}" Margin="0,0,8,0" VerticalAlignment="Center"/>
-                                    <TextBlock Text="IED Explorer" FontSize="15.5" FontWeight="SemiBold" Foreground="{StaticResource Ink}" VerticalAlignment="Center"/>
+                                    <TextBlock Text="IED Explorer" Style="{StaticResource SectionTitle}" VerticalAlignment="Center"/>
                                 </StackPanel>
                                 <StackPanel Grid.Column="1" Orientation="Horizontal" HorizontalAlignment="Right">
                                     <Button Style="{StaticResource IedIconButton}" Click="OpenProject_Click" ToolTip="Open ArIED project" Margin="0,0,6,0">
@@ -237,20 +237,20 @@
 
                                       <Border x:Name="ConnectedBadge" Grid.Row="1" Grid.Column="0"
                                               HorizontalAlignment="Center" VerticalAlignment="Bottom" Margin="0,0,4,1"
-                                              Background="#E8F8EF" BorderBrush="#9DD8B7" BorderThickness="1"
+                                              Background="#E5F7ED" BorderBrush="#8CCDA8" BorderThickness="1"
                                               CornerRadius="9" Padding="6,2" Visibility="Collapsed" Panel.ZIndex="4">
                                           <StackPanel Orientation="Horizontal">
-                                              <Ellipse Width="5" Height="5" Fill="#16A34A" Margin="0,0,4,0" VerticalAlignment="Center"/>
-                                              <TextBlock Text="LIVE" FontSize="8.6" FontWeight="Bold" Foreground="#107A43"/>
+                                              <Ellipse Width="5" Height="5" Fill="{StaticResource Success}" Margin="0,0,4,0" VerticalAlignment="Center"/>
+                                              <TextBlock Text="LIVE" FontSize="8.6" FontWeight="Bold" Foreground="{StaticResource Success}"/>
                                           </StackPanel>
                                       </Border>
 
 <StackPanel Grid.Row="0" Grid.Column="1" VerticalAlignment="Top" HorizontalAlignment="Stretch" Margin="0,0,25,0">
-                                                    <TextBlock Text="{Binding Name}" FontSize="13.2" FontWeight="SemiBold"
-                                                               Foreground="{StaticResource Ink}" TextTrimming="CharacterEllipsis"
+                                                    <TextBlock Text="{Binding Name}" FontSize="12.8" FontWeight="SemiBold"
+                                                               Foreground="{StaticResource Ink}" TextOptions.TextFormattingMode="Display" TextTrimming="CharacterEllipsis"
                                                                TextAlignment="Center" HorizontalAlignment="Stretch"/>
-                                                    <TextBlock Text="{Binding EndpointText}" FontSize="11.6"
-                                                               Foreground="{StaticResource Muted}" Margin="0,2,0,0"
+                                                    <TextBlock Text="{Binding EndpointText}" FontSize="11.1"
+                                                               Foreground="{StaticResource Muted}" TextOptions.TextFormattingMode="Display" Margin="0,2,0,0"
                                                                TextTrimming="CharacterEllipsis" TextAlignment="Center" HorizontalAlignment="Stretch"/>
                                                 </StackPanel>
 
diff --git a/scripts/publish-windows-portable.ps1 b/scripts/publish-windows-portable.ps1
index 5593ed7d..01eb1a37 100644
--- a/scripts/publish-windows-portable.ps1
+++ b/scripts/publish-windows-portable.ps1
@@ -1,5 +1,5 @@
 param(
-    [string]$Version = "1.6.12",
+    [string]$Version = "1.6.13",
     [string]$Runtime = "win-x64",
     [bool]$SingleFile = $true,
     [bool]$SelfContained = $true,
@@ -23,7 +23,7 @@ if ($normalizedVersion.StartsWith("v", [System.StringComparison]::OrdinalIgnoreC
     $normalizedVersion = $normalizedVersion.Substring(1)
 }
 if ($normalizedVersion -notmatch '^\d+\.\d+\.\d+([-.][0-9A-Za-z.-]+)?$') {
-    throw "Invalid version '$Version'. Use a value such as 1.6.12 or v1.6.12."
+    throw "Invalid version '$Version'. Use a value such as 1.6.13 or v1.6.13."
 }
 
 $outputRoot = Join-Path $root "dist"