diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 3ea37a8b..e7e35b69 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -24,6 +24,32 @@ jobs:
         shell: powershell
         run: .\ArIED61850Tester\scripts\verify-source-clean.ps1
 
+      - name: Verify premium P0 UX invariants
+        shell: powershell
+        run: |
+          $main = Get-Content .\ArIED61850Tester\MainWindow.xaml -Raw
+          $save = Get-Content .\ArIED61850Tester\SaveSclWindow.xaml -Raw
+          if ($save -notmatch 'x:Name="EditionIndicator"' -or
+              $save -notmatch 'Content="Edition 2"' -or
+              $save -notmatch 'Content="Edition 1"') {
+            throw "Save SCL segmented Edition 2 / Edition 1 selector was not found."
+          }
+          if ($save -match '<ComboBox' -or $save -match 'Schema V3\.1' -or $save -match 'Schema V1\.6') {
+            throw "Save SCL still exposes the legacy schema ComboBox or technical schema revision labels."
+          }
+          if ($main -notmatch 'ScrollViewer.HorizontalScrollBarVisibility="Disabled"' -or
+              $main -notmatch 'CanUserResizeColumns="False"') {
+            throw "IED Command Panel horizontal overflow protection was not found."
+          }
+          if ($main -notmatch 'Content="\{Binding ControlPendingConfirmationLabel\}"' -or
+              $main -match 'Content="Confirm Open"' -or
+              $main -match 'Content="Confirm Close"') {
+            throw "Atomic single-button control confirmation regressed."
+          }
+          if ($main -notmatch 'LucideRefreshCw' -or $main -notmatch 'HorizontalAlignment="Center"') {
+            throw "Premium Lucide icon or centered IED card layout invariant was not found."
+          }
+
       - name: Upload source snapshot
         uses: actions/upload-artifact@v4
         with:
@@ -100,7 +126,7 @@ jobs:
 
       - name: Publish portable x64
         shell: powershell
-        run: .\ArIED61850Tester\scripts\publish-windows-portable.ps1 -Version 1.6.10 -EngineProject "$env:GITHUB_WORKSPACE\ARIEC61850\src\AR.Iec61850\AR.Iec61850.csproj"
+        run: .\ArIED61850Tester\scripts\publish-windows-portable.ps1 -Version 1.6.11 -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 5079062a..96b3c619 100644
--- a/App.xaml
+++ b/App.xaml
@@ -8,7 +8,7 @@
         <Color x:Key="AccentColor">#2563EB</Color>
         <Color x:Key="AccentDeepColor">#1D4ED8</Color>
         <Color x:Key="SoftBlueColor">#EAF1FF</Color>
-        <Color x:Key="BgColor">#F5F7FB</Color>
+        <Color x:Key="BgColor">#EEF3F9</Color>
         <Color x:Key="LineColor">#E5EAF3</Color>
 
         <SolidColorBrush x:Key="Ink" Color="{StaticResource InkColor}"/>
@@ -23,15 +23,77 @@
         <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"/>
+        </LinearGradientBrush>
+        <LinearGradientBrush x:Key="PremiumSurface" StartPoint="0,0" EndPoint="1,1">
+            <GradientStop Color="#FFFFFF" Offset="0"/>
+            <GradientStop Color="#F7FAFF" Offset="1"/>
+        </LinearGradientBrush>
+        <LinearGradientBrush x:Key="PremiumSurfaceHover" StartPoint="0,0" EndPoint="1,1">
+            <GradientStop Color="#FFFFFF" Offset="0"/>
+            <GradientStop Color="#EEF5FF" Offset="1"/>
+        </LinearGradientBrush>
+        <LinearGradientBrush x:Key="PremiumSurfaceSelected" StartPoint="0,0" EndPoint="1,1">
+            <GradientStop Color="#F8FBFF" Offset="0"/>
+            <GradientStop Color="#E6F0FF" Offset="1"/>
+        </LinearGradientBrush>
+        <LinearGradientBrush x:Key="AccentGradient" StartPoint="0,0" EndPoint="1,1">
+            <GradientStop Color="#3B82F6" Offset="0"/>
+            <GradientStop Color="#4F46E5" Offset="1"/>
+        </LinearGradientBrush>
+        <LinearGradientBrush x:Key="SoftButtonGradient" StartPoint="0,0" EndPoint="1,1">
+            <GradientStop Color="#F8FAFF" Offset="0"/>
+            <GradientStop Color="#EAF1FF" Offset="1"/>
+        </LinearGradientBrush>
+        <LinearGradientBrush x:Key="IedCardSurface" StartPoint="0,0" EndPoint="1,1">
+            <GradientStop Color="#FFFFFF" Offset="0"/>
+            <GradientStop Color="#F5F9FF" Offset="0.68"/>
+            <GradientStop Color="#EEF4FF" Offset="1"/>
+        </LinearGradientBrush>
+        <LinearGradientBrush x:Key="IedCardHover" StartPoint="0,0" EndPoint="1,1">
+            <GradientStop Color="#FFFFFF" Offset="0"/>
+            <GradientStop Color="#EAF3FF" Offset="1"/>
+        </LinearGradientBrush>
+        <LinearGradientBrush x:Key="IedCardSelected" StartPoint="0,0" EndPoint="1,1">
+            <GradientStop Color="#F7FBFF" Offset="0"/>
+            <GradientStop Color="#DCEAFF" Offset="1"/>
+        </LinearGradientBrush>
+
+        <!-- Lucide-compatible 24 px outline geometries used by every visible application action. -->
+        <Geometry x:Key="LucidePlay">M8,5 L19,12 L8,19 Z</Geometry>
+        <Geometry x:Key="LucideSquare">M6,6 H18 V18 H6 Z</Geometry>
+        <Geometry x:Key="LucidePencilLine">M12,20 H21 M16.5,3.5 A2.12,2.12 0 0 1 19.5,6.5 L7,19 L3,20 L4,16 Z</Geometry>
+        <Geometry x:Key="LucideSave">M19,21 H5 A2,2 0 0 1 3,19 V5 A2,2 0 0 1 5,3 H16 L21,8 V19 A2,2 0 0 1 19,21 Z M17,21 V13 H7 V21 M7,3 V8 H15</Geometry>
+        <Geometry x:Key="LucideX">M18,6 L6,18 M6,6 L18,18</Geometry>
+        <Geometry x:Key="LucideRefreshCw">M20,11 A8,8 0 1 0 18.3,16 M20,4 V11 H13</Geometry>
+        <Geometry x:Key="LucideFolderOpen">M3,7 H9 L11,9 H21 L19,20 H3 Z M3,7 V5 H9 L11,7</Geometry>
+        <Geometry x:Key="LucideFileInput">M14,2 V8 H20 M14,2 H6 A2,2 0 0 0 4,4 V20 A2,2 0 0 0 6,22 H18 A2,2 0 0 0 20,20 V8 Z M9,15 H15 M12,12 L15,15 L12,18</Geometry>
+        <Geometry x:Key="LucideFileOutput">M14,2 V8 H20 M14,2 H6 A2,2 0 0 0 4,4 V20 A2,2 0 0 0 6,22 H18 A2,2 0 0 0 20,20 V8 Z M10,15 H16 M13,12 L16,15 L13,18</Geometry>
+        <Geometry x:Key="LucidePlus">M12,5 V19 M5,12 H19</Geometry>
+
+        <Style x:Key="LucideIcon" TargetType="Path">
+            <Setter Property="Fill" Value="Transparent"/>
+            <Setter Property="Stroke" Value="{StaticResource Accent}"/>
+            <Setter Property="StrokeThickness" Value="2"/>
+            <Setter Property="StrokeLineJoin" Value="Round"/>
+            <Setter Property="StrokeStartLineCap" Value="Round"/>
+            <Setter Property="StrokeEndLineCap" Value="Round"/>
+            <Setter Property="Stretch" Value="Uniform"/>
+        </Style>
+
         <DropShadowEffect x:Key="CardShadow" BlurRadius="22" ShadowDepth="8" Opacity="0.075" Color="#172033"/>
         <DropShadowEffect x:Key="ButtonShadow" BlurRadius="18" ShadowDepth="5" Opacity="0.16" Color="#2563EB"/>
         <DropShadowEffect x:Key="SoftShadow" BlurRadius="16" ShadowDepth="4" Opacity="0.07" Color="#172033"/>
 
         <Style x:Key="Card" TargetType="Border">
-            <Setter Property="Background" Value="White"/>
+            <Setter Property="Background" Value="{StaticResource PremiumSurface}"/>
             <Setter Property="CornerRadius" Value="18"/>
             <Setter Property="Padding" Value="14"/>
-            <Setter Property="BorderBrush" Value="{StaticResource Line}"/>
+            <Setter Property="BorderBrush" Value="#D6E1F0"/>
             <Setter Property="BorderThickness" Value="1"/>
             <Setter Property="Effect" Value="{StaticResource CardShadow}"/>
         </Style>
@@ -78,7 +140,7 @@
 
         <Style x:Key="PrimaryButton" TargetType="Button">
             <Setter Property="Foreground" Value="White"/>
-            <Setter Property="Background" Value="{StaticResource Accent}"/>
+            <Setter Property="Background" Value="{StaticResource AccentGradient}"/>
             <Setter Property="BorderBrush" Value="Transparent"/>
             <Setter Property="BorderThickness" Value="0"/>
             <Setter Property="Padding" Value="14,8"/>
@@ -91,7 +153,7 @@
                 <Setter.Value>
                     <ControlTemplate TargetType="Button">
                         <Grid SnapsToDevicePixels="True">
-                            <Border x:Name="Chrome" Background="{TemplateBinding Background}" CornerRadius="14" RenderTransformOrigin="0.5,0.5">
+                            <Border x:Name="Chrome" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="14" RenderTransformOrigin="0.5,0.5">
                                 <Border.RenderTransform>
                                     <ScaleTransform ScaleX="1" ScaleY="1"/>
                                 </Border.RenderTransform>
@@ -143,9 +205,9 @@
 
         <Style x:Key="SoftButton" TargetType="Button">
             <Setter Property="Foreground" Value="{StaticResource Ink}"/>
-            <Setter Property="Background" Value="#EEF3FF"/>
-            <Setter Property="BorderBrush" Value="Transparent"/>
-            <Setter Property="BorderThickness" Value="0"/>
+            <Setter Property="Background" Value="{StaticResource SoftButtonGradient}"/>
+            <Setter Property="BorderBrush" Value="#CBD9EE"/>
+            <Setter Property="BorderThickness" Value="1"/>
             <Setter Property="Padding" Value="14,8"/>
             <Setter Property="MinHeight" Value="34"/>
             <Setter Property="FontWeight" Value="SemiBold"/>
@@ -156,7 +218,7 @@
                 <Setter.Value>
                     <ControlTemplate TargetType="Button">
                         <Grid SnapsToDevicePixels="True">
-                            <Border x:Name="Chrome" Background="{TemplateBinding Background}" CornerRadius="14" RenderTransformOrigin="0.5,0.5">
+                            <Border x:Name="Chrome" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="14" RenderTransformOrigin="0.5,0.5">
                                 <Border.RenderTransform>
                                     <ScaleTransform ScaleX="1" ScaleY="1"/>
                                 </Border.RenderTransform>
@@ -297,22 +359,23 @@
             <Setter Property="Height" Value="31"/>
             <Setter Property="Padding" Value="0"/>
             <Setter Property="Margin" Value="1"/>
-            <Setter Property="Background" Value="Transparent"/>
-            <Setter Property="BorderThickness" Value="0"/>
+            <Setter Property="Background" Value="#F6F9FF"/>
+            <Setter Property="BorderBrush" Value="#D6E1F0"/>
+            <Setter Property="BorderThickness" Value="1"/>
             <Setter Property="Cursor" Value="Hand"/>
             <Setter Property="Focusable" Value="False"/>
             <Setter Property="Template">
                 <Setter.Value>
                     <ControlTemplate TargetType="Button">
                         <Border x:Name="Chrome" Background="{TemplateBinding Background}" CornerRadius="9"
-                                BorderBrush="#DCE5F3" BorderThickness="0" RenderTransformOrigin="0.5,0.5">
+                                BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" RenderTransformOrigin="0.5,0.5">
                             <Border.RenderTransform><ScaleTransform ScaleX="1" ScaleY="1"/></Border.RenderTransform>
                             <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center"/>
                         </Border>
                         <ControlTemplate.Triggers>
                             <Trigger Property="IsMouseOver" Value="True">
                                 <Setter TargetName="Chrome" Property="Background" Value="#FFFFFF"/>
-                                <Setter TargetName="Chrome" Property="BorderThickness" Value="1"/>
+                                <Setter TargetName="Chrome" Property="BorderBrush" Value="#9CB8E8"/>
                                 <Setter TargetName="Chrome" Property="RenderTransform">
                                     <Setter.Value><ScaleTransform ScaleX="1.06" ScaleY="1.06"/></Setter.Value>
                                 </Setter>
@@ -550,8 +613,8 @@
             <Setter Property="HeadersVisibility" Value="Column"/>
             <Setter Property="GridLinesVisibility" Value="None"/>
             <Setter Property="RowHeaderWidth" Value="0"/>
-            <Setter Property="Background" Value="Transparent"/>
-            <Setter Property="BorderBrush" Value="{StaticResource Line}"/>
+            <Setter Property="Background" Value="#FBFDFF"/>
+            <Setter Property="BorderBrush" Value="#D4DFEE"/>
             <Setter Property="BorderThickness" Value="1"/>
             <Setter Property="HorizontalGridLinesBrush" Value="Transparent"/>
             <Setter Property="VerticalGridLinesBrush" Value="Transparent"/>
@@ -564,7 +627,7 @@
             <Setter Property="CanUserDeleteRows" Value="False"/>
             <Setter Property="RowHeight" Value="34"/>
             <Setter Property="ColumnHeaderHeight" Value="34"/>
-            <Setter Property="AlternatingRowBackground" Value="#FBFCFF"/>
+            <Setter Property="AlternatingRowBackground" Value="#F5F8FD"/>
             <Setter Property="FontSize" Value="12.5"/>
             <Setter Property="VerticalContentAlignment" Value="Center"/>
         </Style>
diff --git a/ArIED61850Tester.csproj b/ArIED61850Tester.csproj
index 61bdd39f..286f610a 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.10</Version>
-    <AssemblyVersion>1.6.10.0</AssemblyVersion>
-    <FileVersion>1.6.10.0</FileVersion>
+    <Version>1.6.11</Version>
+    <AssemblyVersion>1.6.11.0</AssemblyVersion>
+    <FileVersion>1.6.11.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 a1e9a31d..beaa31a3 100644
--- a/MainWindow.xaml
+++ b/MainWindow.xaml
@@ -3,7 +3,7 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         Title="ArIED 61850 — Smart IED Explorer &amp; Monitor"
         Height="900" Width="1480" MinHeight="760" MinWidth="1180"
-        WindowStartupLocation="CenterScreen" Background="{StaticResource Bg}"
+        WindowStartupLocation="CenterScreen" Background="{StaticResource AppBackgroundGradient}"
         FontFamily="Aptos, Segoe UI Variable Text, Segoe UI, Calibri"
         Icon="Assets/app-icon.ico" Closing="Window_Closing">
     <Grid Margin="12">
@@ -97,14 +97,14 @@
                                 </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">
-                                        <Viewbox Width="16" Height="16"><Canvas Width="24" Height="24">
-                                            <Path Data="M4,7 H10 L12,9 H20 V20 H4 Z M4,7 V5 H10 L12,7" Stroke="#2563EB" StrokeThickness="1.8" StrokeLineJoin="Round" StrokeStartLineCap="Round" StrokeEndLineCap="Round" Fill="Transparent"/>
-                                        </Canvas></Viewbox>
+                                        <Viewbox Width="16" Height="16">
+                                            <Path Data="{StaticResource LucideFolderOpen}" Style="{StaticResource LucideIcon}"/>
+                                        </Viewbox>
                                     </Button>
                                     <Button Style="{StaticResource IedIconButton}" Click="SaveProject_Click" ToolTip="Save ArIED project">
-                                        <Viewbox Width="16" Height="16"><Canvas Width="24" Height="24">
-                                            <Path Data="M5,4 H17 L20,7 V20 H5 Z M8,4 V9 H16 V4 M9,20 V14 H16 V20" Stroke="#2563EB" StrokeThickness="1.8" StrokeLineJoin="Round" StrokeStartLineCap="Round" StrokeEndLineCap="Round" Fill="Transparent"/>
-                                        </Canvas></Viewbox>
+                                        <Viewbox Width="16" Height="16">
+                                            <Path Data="{StaticResource LucideSave}" Style="{StaticResource LucideIcon}"/>
+                                        </Viewbox>
                                     </Button>
                                 </StackPanel>
                             </Grid>
@@ -130,10 +130,8 @@
                                             Style="{StaticResource SoftButton}" Padding="8,7" FontSize="11.5"
                                             ToolTip="Fast-connect every saved or SCL-imported IED and start live monitoring for saved selections">
                                         <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
-                                            <Viewbox Width="13" Height="13" Margin="0,0,4,0">
-                                                <Canvas Width="24" Height="24">
-                                                    <Path Data="M5,3 L19,12 L5,21 Z" Stroke="#16A34A" StrokeThickness="2" StrokeLineJoin="Round" Fill="Transparent"/>
-                                                </Canvas>
+                                            <Viewbox Width="13" Height="13" Margin="0,0,5,0">
+                                                <Path Data="{StaticResource LucidePlay}" Style="{StaticResource LucideIcon}" Stroke="#16A34A"/>
                                             </Viewbox>
                                             <TextBlock Text="Connect All" FontWeight="SemiBold"/>
                                         </StackPanel>
@@ -143,10 +141,8 @@
                                             Style="{StaticResource SoftButton}" Padding="7,7" FontSize="11.2"
                                             ToolTip="Import one or more IED endpoints from SCD, CID, ICD, IID, SSD, or XML SCL files">
                                         <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
-                                            <Viewbox Width="13" Height="13" Margin="0,0,4,0">
-                                                <Canvas Width="24" Height="24">
-                                                    <Path Data="M6,2 H14 L19,7 V22 H6 Z M14,2 V7 H19" Stroke="#2563EB" StrokeThickness="1.8" StrokeLineJoin="Round" Fill="Transparent"/>
-                                                </Canvas>
+                                            <Viewbox Width="13" Height="13" Margin="0,0,5,0">
+                                                <Path Data="{StaticResource LucideFileInput}" Style="{StaticResource LucideIcon}"/>
                                             </Viewbox>
                                             <TextBlock Text="Open SCL" FontWeight="SemiBold"/>
                                         </StackPanel>
@@ -156,7 +152,9 @@
                                             Style="{StaticResource PrimaryButton}" Padding="7,7" FontSize="11.2"
                                             ToolTip="Add an IEC 61850 IED by IP address">
                                         <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
-                                            <TextBlock Text="＋" FontSize="15" FontWeight="SemiBold" Margin="0,-1,4,0"/>
+                                            <Viewbox Width="13" Height="13" Margin="0,0,5,0">
+                                                <Path Data="{StaticResource LucidePlus}" Style="{StaticResource LucideIcon}" Stroke="White"/>
+                                            </Viewbox>
                                             <TextBlock Text="Add IED" FontWeight="SemiBold"/>
                                         </StackPanel>
                                     </Button>
@@ -176,16 +174,22 @@
                                         <Setter Property="Template">
                                             <Setter.Value>
                                                 <ControlTemplate TargetType="ListBoxItem">
-                                                    <Border x:Name="Card" Background="White" BorderBrush="{StaticResource Line}" BorderThickness="1" CornerRadius="14" Padding="8">
+                                                    <Border x:Name="Card" Background="{StaticResource IedCardSurface}"
+                                                            BorderBrush="#CDD9EA" BorderThickness="1" CornerRadius="16" Padding="9"
+                                                            RenderTransformOrigin="0.5,0.5">
+                                                        <Border.RenderTransform><ScaleTransform ScaleX="1" ScaleY="1"/></Border.RenderTransform>
+                                                        <Border.Effect><DropShadowEffect BlurRadius="15" ShadowDepth="4" Opacity="0.09" Color="#1E3355"/></Border.Effect>
                                                         <ContentPresenter/>
                                                     </Border>
                                                     <ControlTemplate.Triggers>
                                                         <Trigger Property="IsSelected" Value="True">
-                                                            <Setter TargetName="Card" Property="Background" Value="#F3F7FF"/>
-                                                            <Setter TargetName="Card" Property="BorderBrush" Value="#9ABAFB"/>
+                                                            <Setter TargetName="Card" Property="Background" Value="{StaticResource IedCardSelected}"/>
+                                                            <Setter TargetName="Card" Property="BorderBrush" Value="#79A7F8"/>
                                                         </Trigger>
                                                         <Trigger Property="IsMouseOver" Value="True">
-                                                            <Setter TargetName="Card" Property="Background" Value="#F8FAFD"/>
+                                                            <Setter TargetName="Card" Property="Background" Value="{StaticResource IedCardHover}"/>
+                                                            <Setter TargetName="Card" Property="BorderBrush" Value="#9AB8E8"/>
+                                                            <Setter TargetName="Card" Property="RenderTransform"><Setter.Value><ScaleTransform ScaleX="1.012" ScaleY="1.012"/></Setter.Value></Setter>
                                                         </Trigger>
                                                     </ControlTemplate.Triggers>
                                                 </ControlTemplate>
@@ -214,37 +218,33 @@
                                           </Viewbox>
                                       </Grid>
 
-<StackPanel Grid.Row="0" Grid.Column="1" VerticalAlignment="Top">
-                                                    <TextBlock Text="{Binding Name}" FontSize="13" FontWeight="SemiBold"
-                                                               Foreground="{StaticResource Ink}" TextTrimming="CharacterEllipsis" Margin="0,0,28,0"/>
+<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"
+                                                               TextAlignment="Center" HorizontalAlignment="Stretch"/>
                                                     <TextBlock Text="{Binding EndpointText}" FontSize="11.6"
                                                                Foreground="{StaticResource Muted}" Margin="0,2,0,0"
-                                                               TextTrimming="CharacterEllipsis"/>
+                                                               TextTrimming="CharacterEllipsis" TextAlignment="Center" HorizontalAlignment="Stretch"/>
                                                 </StackPanel>
 
                                                 <!-- Direct, unobstructed hit targets below the IP address. -->
                                                 <StackPanel Grid.Row="1" Grid.Column="1" Orientation="Horizontal"
-                                                            HorizontalAlignment="Left" Margin="0,4,0,0" Panel.ZIndex="10">
+                                                            HorizontalAlignment="Center" Margin="0,5,25,0" Panel.ZIndex="10">
                                                     <Button Style="{StaticResource IedIconButton}" Tag="{Binding}" Click="IedPlayAction_Click"
                                                             IsEnabled="{Binding CanPlayAction}" ToolTip="{Binding PlayToolTip}">
-                                                        <Viewbox Width="16" Height="16"><Canvas Width="24" Height="24"><Path Data="M6,3 L20,12 L6,21 Z" Stroke="#16A34A" StrokeThickness="2" StrokeLineJoin="Round" Fill="Transparent"/></Canvas></Viewbox>
+                                                        <Viewbox Width="16" Height="16"><Path Data="{StaticResource LucidePlay}" Style="{StaticResource LucideIcon}" Stroke="#16A34A"/></Viewbox>
                                                     </Button>
                                                     <Button Style="{StaticResource IedIconButton}" Tag="{Binding}" Click="IedStopAction_Click"
                                                             IsEnabled="{Binding CanStopAction}" ToolTip="{Binding StopToolTip}">
-                                                        <Viewbox Width="16" Height="16"><Canvas Width="24" Height="24"><Path Data="M6,6 L18,6 L18,18 L6,18 Z" Stroke="#DC2626" StrokeThickness="2" StrokeLineJoin="Round" Fill="Transparent"/></Canvas></Viewbox>
+                                                        <Viewbox Width="16" Height="16"><Path Data="{StaticResource LucideSquare}" Style="{StaticResource LucideIcon}" Stroke="#DC2626"/></Viewbox>
                                                     </Button>
                                                     <Button Style="{StaticResource IedIconButton}" Tag="{Binding}" Click="IedConfigureSignals_Click"
                                                             IsEnabled="{Binding CanEditSignals}" ToolTip="{Binding ConfigureToolTip}">
-                                                        <Viewbox Width="16" Height="16"><Canvas Width="24" Height="24">
-                                                            <Path Data="M12,20 L21,20" Stroke="#2563EB" StrokeThickness="2" StrokeStartLineCap="Round" StrokeEndLineCap="Round"/>
-                                                            <Path Data="M16.5,3.5 A2.12,2.12 0 0 1 19.5,6.5 L7,19 L3,20 L4,16 Z" Stroke="#2563EB" StrokeThickness="2" StrokeLineJoin="Round" Fill="Transparent"/>
-                                                        </Canvas></Viewbox>
+                                                        <Viewbox Width="16" Height="16"><Path Data="{StaticResource LucidePencilLine}" Style="{StaticResource LucideIcon}"/></Viewbox>
                                                     </Button>
                                                     <Button Style="{StaticResource IedIconButton}" Tag="{Binding}" Click="IedSaveScl_Click"
                                                             IsEnabled="{Binding CanSaveScl}" ToolTip="{Binding SaveSclToolTip}">
-                                                        <Viewbox Width="16" Height="16"><Canvas Width="24" Height="24">
-                                                            <Path Data="M5,4 H17 L20,7 V20 H5 Z M8,4 V9 H16 V4 M9,20 V14 H16 V20" Stroke="#2563EB" StrokeThickness="1.8" StrokeLineJoin="Round" StrokeStartLineCap="Round" StrokeEndLineCap="Round" Fill="Transparent"/>
-                                                        </Canvas></Viewbox>
+                                                        <Viewbox Width="16" Height="16"><Path Data="{StaticResource LucideSave}" Style="{StaticResource LucideIcon}"/></Viewbox>
                                                     </Button>
                                                 </StackPanel>
                                             </Grid>
@@ -253,9 +253,7 @@
                                                     IsEnabled="{Binding IsActionEnabled}" ToolTip="{Binding RemoveToolTip}"
                                                     Width="25" Height="25" Margin="0,-4,-4,0"
                                                     HorizontalAlignment="Right" VerticalAlignment="Top" Panel.ZIndex="12">
-                                                <Viewbox Width="14" Height="14"><Canvas Width="24" Height="24">
-                                                    <Path Data="M18,6 L6,18 M6,6 L18,18" Stroke="#64748B" StrokeThickness="2" StrokeStartLineCap="Round" StrokeEndLineCap="Round"/>
-                                                </Canvas></Viewbox>
+                                                <Viewbox Width="14" Height="14"><Path Data="{StaticResource LucideX}" Style="{StaticResource LucideIcon}" Stroke="#64748B"/></Viewbox>
                                             </Button>
 
                                             <Border x:Name="BusyOverlay" Visibility="Collapsed" Background="#F2F7FDFA" CornerRadius="12"
@@ -329,7 +327,12 @@
                                         <TextBlock Text="Connect a relay by IP, let ArIED discover the live IEC 61850 MMS model, choose only the signals you need, then monitor every IED independently."
                                                    TextWrapping="Wrap" FontSize="13.4" Foreground="{StaticResource Muted}" Margin="0,10,0,18"/>
                                         <WrapPanel>
-                                            <Button Content="📂 Open Project" Style="{StaticResource SoftButton}" Click="OpenProject_Click" Margin="0,0,10,0"/>
+                                            <Button Style="{StaticResource SoftButton}" Click="OpenProject_Click" Margin="0,0,10,0">
+                                                <StackPanel Orientation="Horizontal">
+                                                    <Viewbox Width="15" Height="15" Margin="0,0,7,0"><Path Data="{StaticResource LucideFolderOpen}" Style="{StaticResource LucideIcon}"/></Viewbox>
+                                                    <TextBlock Text="Open Project"/>
+                                                </StackPanel>
+                                            </Button>
                                             <TextBlock Text="Use the always-visible Add IED action below the Explorer list."
                                                        Style="{StaticResource Caption}" VerticalAlignment="Center"/>
                                         </WrapPanel>
@@ -402,7 +405,7 @@
 
                             <Expander x:Name="CommandPanelExpander" Grid.Row="1" Header="IED Command Panel" Margin="0,9,0,0"
                                       IsExpanded="False">
-                                <Border Style="{StaticResource Card}" Padding="12">
+                                <Border Style="{StaticResource Card}" Padding="14" BorderBrush="#C7D7EC">
                                     <Grid>
                                         <Grid.RowDefinitions>
                                             <RowDefinition Height="Auto"/>
@@ -418,9 +421,19 @@
                                                 <TextBlock Text="Fast IEC 61850 Control" FontSize="14" FontWeight="SemiBold" Foreground="{StaticResource Ink}"/>
                                             </StackPanel>
                                             <WrapPanel Grid.Column="1" Margin="12,0,0,0" VerticalAlignment="Center">
-                                                <Button Content="Refresh values" Click="RefreshCommandValues_Click" Style="{StaticResource SoftButton}" Padding="11,6" Margin="0,0,8,0"/>
-                                                <Button Content="Edit signals" Tag="{Binding SelectedDevice}" Click="IedConfigureSignals_Click"
-                                                        Style="{StaticResource SoftButton}" Padding="11,6" IsEnabled="{Binding SelectedDevice.CanEditSignals}"/>
+                                                <Button Click="RefreshCommandValues_Click" Style="{StaticResource SoftButton}" Padding="11,6" Margin="0,0,8,0">
+                                                    <StackPanel Orientation="Horizontal">
+                                                        <Viewbox Width="14" Height="14" Margin="0,0,6,0"><Path Data="{StaticResource LucideRefreshCw}" Style="{StaticResource LucideIcon}"/></Viewbox>
+                                                        <TextBlock Text="Refresh values"/>
+                                                    </StackPanel>
+                                                </Button>
+                                                <Button Tag="{Binding SelectedDevice}" Click="IedConfigureSignals_Click"
+                                                        Style="{StaticResource SoftButton}" Padding="11,6" IsEnabled="{Binding SelectedDevice.CanEditSignals}">
+                                                    <StackPanel Orientation="Horizontal">
+                                                        <Viewbox Width="14" Height="14" Margin="0,0,6,0"><Path Data="{StaticResource LucidePencilLine}" Style="{StaticResource LucideIcon}"/></Viewbox>
+                                                        <TextBlock Text="Edit signals"/>
+                                                    </StackPanel>
+                                                </Button>
                                             </WrapPanel>
                                         </Grid>
 
@@ -429,10 +442,11 @@
                                                       AutoGenerateColumns="False" MaxHeight="300" MinHeight="52" RowHeight="44" MinRowHeight="42" FrozenColumnCount="1"
                                                       EnableRowVirtualization="True" EnableColumnVirtualization="True"
                                                       VirtualizingPanel.IsVirtualizing="True" VirtualizingPanel.VirtualizationMode="Recycling"
-                                                      ScrollViewer.CanContentScroll="True" ScrollViewer.HorizontalScrollBarVisibility="Auto">
+                                                      ScrollViewer.CanContentScroll="True" ScrollViewer.HorizontalScrollBarVisibility="Disabled"
+                                                      CanUserResizeColumns="False" ClipToBounds="True">
                                                 <DataGrid.Columns>
-                                                    <DataGridTextColumn Header="IEC Telegram" Binding="{Binding DisplayReference}" Width="2.1*" MinWidth="210" IsReadOnly="True"/>
-                                                    <DataGridTemplateColumn Header="Value" Width="0.85*" MinWidth="105">
+                                                    <DataGridTextColumn Header="IEC Telegram" Binding="{Binding DisplayReference}" Width="1.9*" MinWidth="145" IsReadOnly="True"/>
+                                                    <DataGridTemplateColumn Header="Value" Width="0.78*" MinWidth="88">
                                                         <DataGridTemplateColumn.CellTemplate>
                                                             <DataTemplate>
                                                                 <Border Padding="9,5" CornerRadius="10" HorizontalAlignment="Left" MinWidth="76">
@@ -473,28 +487,28 @@
                                                             </DataTemplate>
                                                         </DataGridTemplateColumn.CellTemplate>
                                                     </DataGridTemplateColumn>
-                                                    <DataGridTextColumn Header="CDC / Type" Binding="{Binding ControlCdc}" Width="0.72*" MinWidth="88" IsReadOnly="True"/>
-                                                    <DataGridTextColumn Header="Control model" Binding="{Binding ControlModelText}" Width="1.35*" MinWidth="175" IsReadOnly="True"/>
-                                                    <DataGridTemplateColumn Header="Checks" Width="1.35*" MinWidth="210">
+                                                    <DataGridTextColumn Header="CDC / Type" Binding="{Binding ControlCdc}" Width="0.7*" MinWidth="74" IsReadOnly="True"/>
+                                                    <DataGridTextColumn Header="Control model" Binding="{Binding ControlModelText}" Width="1.15*" MinWidth="130" IsReadOnly="True"/>
+                                                    <DataGridTemplateColumn Header="Checks" Width="1.22*" MinWidth="165">
                                                         <DataGridTemplateColumn.CellTemplate>
                                                             <DataTemplate>
-                                                                <StackPanel Orientation="Horizontal" VerticalAlignment="Center" Margin="0,2">
-                                                                    <CheckBox Content="Interlock"
+                                                                <WrapPanel Orientation="Horizontal" VerticalAlignment="Center" Margin="0,2">
+                                                                    <CheckBox Content="Interlock" FontSize="11.6"
                                                                               IsChecked="{Binding ControlInterlockCheck, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                                                                               Margin="0,0,10,0"
                                                                               ToolTip="Set the IEC 61850 interlock check flag for this signal only."/>
-                                                                    <CheckBox Content="Sync"
+                                                                    <CheckBox Content="Sync" FontSize="11.6"
                                                                               IsChecked="{Binding ControlSynchroCheck, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                                                                               Margin="0,0,10,0"
                                                                               ToolTip="Set the IEC 61850 synchrocheck flag for this signal only."/>
-                                                                    <CheckBox Content="Test"
+                                                                    <CheckBox Content="Test" FontSize="11.6"
                                                                               IsChecked="{Binding ControlTestMode, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                                                                               ToolTip="Send this signal in IEC 61850 Test mode."/>
-                                                                </StackPanel>
+                                                                </WrapPanel>
                                                             </DataTemplate>
                                                         </DataGridTemplateColumn.CellTemplate>
                                                     </DataGridTemplateColumn>
-                                                    <DataGridTemplateColumn Header="Control" Width="1.7*" MinWidth="250">
+                                                    <DataGridTemplateColumn Header="Control" Width="1.55*" MinWidth="190">
                                                         <DataGridTemplateColumn.CellTemplate>
                                                             <DataTemplate>
                                                                 <StackPanel Margin="0,3">
diff --git a/SaveSclWindow.xaml b/SaveSclWindow.xaml
index 1c4141d8..c77d2e7c 100644
--- a/SaveSclWindow.xaml
+++ b/SaveSclWindow.xaml
@@ -1,18 +1,53 @@
 <Window x:Class="ArIED61850Tester.SaveSclWindow"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        Title="Save SCL" Height="290" Width="500" MinHeight="290" MinWidth="500"
+        Title="Save SCL" Height="420" Width="590" MinHeight="420" MinWidth="590"
         WindowStartupLocation="CenterOwner" ResizeMode="NoResize"
         Background="{StaticResource Bg}"
         FontFamily="Aptos, Segoe UI Variable Text, Segoe UI, Calibri"
-        Icon="Assets/app-icon.ico">
-    <Grid Margin="16">
+        Icon="Assets/app-icon.ico" Loaded="Window_Loaded">
+    <Window.Resources>
+        <Style x:Key="EditionSegmentButton" TargetType="Button">
+            <Setter Property="Background" Value="Transparent"/>
+            <Setter Property="BorderThickness" Value="0"/>
+            <Setter Property="Foreground" Value="{StaticResource Ink}"/>
+            <Setter Property="FontWeight" Value="SemiBold"/>
+            <Setter Property="FontSize" Value="13.5"/>
+            <Setter Property="Cursor" Value="Hand"/>
+            <Setter Property="Focusable" Value="True"/>
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="Button">
+                        <Border Background="Transparent" CornerRadius="17">
+                            <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                        </Border>
+                        <ControlTemplate.Triggers>
+                            <Trigger Property="IsMouseOver" Value="True">
+                                <Setter Property="Opacity" Value="0.82"/>
+                            </Trigger>
+                            <Trigger Property="IsPressed" Value="True">
+                                <Setter Property="Opacity" Value="0.62"/>
+                            </Trigger>
+                        </ControlTemplate.Triggers>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>
+    </Window.Resources>
+
+    <Grid Margin="20">
         <Grid.RowDefinitions>
             <RowDefinition Height="*"/>
             <RowDefinition Height="Auto"/>
         </Grid.RowDefinitions>
 
-        <Border Style="{StaticResource Card}" Padding="18">
+        <Border CornerRadius="24" BorderBrush="#D5E1F0" BorderThickness="1" Padding="24" Effect="{StaticResource CardShadow}">
+            <Border.Background>
+                <LinearGradientBrush StartPoint="0,0" EndPoint="1,1">
+                    <GradientStop Color="#FFFFFF" Offset="0"/>
+                    <GradientStop Color="#F3F7FF" Offset="1"/>
+                </LinearGradientBrush>
+            </Border.Background>
             <Grid>
                 <Grid.RowDefinitions>
                     <RowDefinition Height="Auto"/>
@@ -20,33 +55,116 @@
                     <RowDefinition Height="Auto"/>
                     <RowDefinition Height="Auto"/>
                 </Grid.RowDefinitions>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="96"/>
-                    <ColumnDefinition Width="*"/>
-                </Grid.ColumnDefinitions>
-
-                <TextBlock Grid.ColumnSpan="2" Text="Save interoperable SCL" FontSize="18" FontWeight="SemiBold" Foreground="{StaticResource Ink}"/>
 
-                <TextBlock Grid.Row="1" Text="IED" Margin="0,16,0,0" VerticalAlignment="Center" Foreground="{StaticResource Muted}"/>
-                <TextBlock Grid.Row="1" Grid.Column="1" Text="{Binding IedName}" Margin="0,16,0,0" VerticalAlignment="Center" FontWeight="SemiBold" Foreground="{StaticResource Ink}"/>
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto"/>
+                        <ColumnDefinition Width="*"/>
+                    </Grid.ColumnDefinitions>
+                    <Border Width="48" Height="48" CornerRadius="16" Margin="0,0,14,0">
+                        <Border.Background>
+                            <LinearGradientBrush StartPoint="0,0" EndPoint="1,1">
+                                <GradientStop Color="#DBEAFE" Offset="0"/>
+                                <GradientStop Color="#E0E7FF" Offset="1"/>
+                            </LinearGradientBrush>
+                        </Border.Background>
+                        <Viewbox Width="23" Height="23" HorizontalAlignment="Center" VerticalAlignment="Center">
+                            <Path Data="{StaticResource LucideFileOutput}" Style="{StaticResource LucideIcon}"/>
+                        </Viewbox>
+                    </Border>
+                    <StackPanel Grid.Column="1" VerticalAlignment="Center">
+                        <TextBlock Text="Save SCL" FontSize="21" FontWeight="SemiBold" Foreground="{StaticResource Ink}"/>
+                        <TextBlock Text="Export a clean interoperable IEC 61850 model" Margin="0,4,0,0"
+                                   FontSize="12.5" Foreground="{StaticResource Muted}"/>
+                    </StackPanel>
+                </Grid>
 
-                <TextBlock Grid.Row="2" Text="Source" Margin="0,12,0,0" VerticalAlignment="Center" Foreground="{StaticResource Muted}"/>
-                <TextBlock Grid.Row="2" Grid.Column="1" Text="{Binding SourceDescription}" Margin="0,12,0,0" VerticalAlignment="Center" Foreground="{StaticResource Ink}" TextWrapping="Wrap"/>
+                <Grid Grid.Row="1" Margin="0,22,0,0">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="*"/>
+                        <ColumnDefinition Width="12"/>
+                        <ColumnDefinition Width="1.5*"/>
+                    </Grid.ColumnDefinitions>
+                    <Border Background="#F8FAFD" BorderBrush="#D9E3F1" BorderThickness="1" CornerRadius="14" Padding="14,11">
+                        <StackPanel>
+                            <TextBlock Text="IED" FontSize="10.5" FontWeight="SemiBold" Foreground="#77859B"/>
+                            <TextBlock Text="{Binding IedName}" Margin="0,4,0,0" FontSize="13.2" FontWeight="SemiBold"
+                                       Foreground="{StaticResource Ink}" TextTrimming="CharacterEllipsis"/>
+                        </StackPanel>
+                    </Border>
+                    <Border Grid.Column="2" Background="#F8FAFD" BorderBrush="#D9E3F1" BorderThickness="1" CornerRadius="14" Padding="14,11">
+                        <StackPanel>
+                            <TextBlock Text="SOURCE" FontSize="10.5" FontWeight="SemiBold" Foreground="#77859B"/>
+                            <TextBlock Text="{Binding SourceDescription}" Margin="0,4,0,0" FontSize="13.2"
+                                       Foreground="{StaticResource Ink}" TextTrimming="CharacterEllipsis"/>
+                        </StackPanel>
+                    </Border>
+                </Grid>
 
-                <TextBlock Grid.Row="3" Text="Edition" Margin="0,14,0,0" VerticalAlignment="Center" Foreground="{StaticResource Muted}"/>
-                <StackPanel Grid.Row="3" Grid.Column="1" Margin="0,14,0,0">
-                    <ComboBox ItemsSource="{Binding SchemaProfiles}"
-                              SelectedItem="{Binding SelectedSchemaProfile}"
-                              DisplayMemberPath="DisplayName"/>
-                    <TextBlock Margin="0,8,0,0" Foreground="{StaticResource Muted}" FontSize="11.5" TextWrapping="Wrap"
-                               Text="Edition 2 is saved as IID. Edition 1 is saved as ICD. A JSON evidence report and Markdown summary are written beside the SCL file."/>
+                <StackPanel Grid.Row="2" Margin="0,22,0,0">
+                    <TextBlock Text="IEC 61850 edition" FontSize="12.2" FontWeight="SemiBold" Foreground="#475467" Margin="1,0,0,8"/>
+                    <Border Width="390" Height="52" HorizontalAlignment="Left" Background="#E7EDF7"
+                            BorderBrush="#D0DBEB" BorderThickness="1" CornerRadius="20" Padding="4">
+                        <Grid ClipToBounds="True">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="*"/>
+                                <ColumnDefinition Width="*"/>
+                            </Grid.ColumnDefinitions>
+                            <Border x:Name="EditionIndicator" Grid.ColumnSpan="2" Width="190" Height="42"
+                                    HorizontalAlignment="Left" VerticalAlignment="Center" CornerRadius="17" RenderTransformOrigin="0.5,0.5">
+                                <Border.Background>
+                                    <LinearGradientBrush StartPoint="0,0" EndPoint="1,1">
+                                        <GradientStop Color="#3B82F6" Offset="0"/>
+                                        <GradientStop Color="#4F46E5" Offset="1"/>
+                                    </LinearGradientBrush>
+                                </Border.Background>
+                                <Border.RenderTransform>
+                                    <TranslateTransform x:Name="EditionIndicatorTranslate" X="0"/>
+                                </Border.RenderTransform>
+                                <Border.Effect>
+                                    <DropShadowEffect BlurRadius="13" ShadowDepth="3" Opacity="0.22" Color="#3159CC"/>
+                                </Border.Effect>
+                            </Border>
+                            <Button x:Name="Edition2Button" Grid.Column="0" Content="Edition 2"
+                                    Style="{StaticResource EditionSegmentButton}" Foreground="White" Click="Edition2_Click"/>
+                            <Button x:Name="Edition1Button" Grid.Column="1" Content="Edition 1"
+                                    Style="{StaticResource EditionSegmentButton}" Click="Edition1_Click"/>
+                        </Grid>
+                    </Border>
+                    <TextBlock Text="{Binding EditionHint}" Margin="2,10,0,0" FontSize="11.7"
+                               Foreground="{StaticResource Muted}" TextWrapping="Wrap"/>
                 </StackPanel>
+
+                <Border Grid.Row="3" Margin="0,18,0,0" Background="#EEF4FF" BorderBrush="#D5E3FA" BorderThickness="1"
+                        CornerRadius="12" Padding="12,9">
+                    <StackPanel Orientation="Horizontal">
+                        <Viewbox Width="15" Height="15" Margin="0,0,8,0" VerticalAlignment="Center">
+                            <Path Data="{StaticResource LucideSave}" Style="{StaticResource LucideIcon}" StrokeThickness="1.8"/>
+                        </Viewbox>
+                        <TextBlock Text="JSON evidence and a Markdown summary are saved beside the SCL file."
+                                   FontSize="11.5" Foreground="#4B5F7B" VerticalAlignment="Center"/>
+                    </StackPanel>
+                </Border>
             </Grid>
         </Border>
 
-        <StackPanel Grid.Row="1" Orientation="Horizontal" HorizontalAlignment="Right" Margin="0,14,0,0">
-            <Button Content="Cancel" Style="{StaticResource SoftButton}" IsCancel="True" MinWidth="96" Margin="0,0,8,0"/>
-            <Button Content="Save SCL" Style="{StaticResource PrimaryButton}" IsDefault="True" MinWidth="112" Click="Save_Click"/>
+        <StackPanel Grid.Row="1" Orientation="Horizontal" HorizontalAlignment="Right" Margin="0,16,0,0">
+            <Button Style="{StaticResource SoftButton}" IsCancel="True" MinWidth="108" Margin="0,0,10,0">
+                <StackPanel Orientation="Horizontal">
+                    <Viewbox Width="15" Height="15" Margin="0,0,7,0">
+                        <Path Data="{StaticResource LucideX}" Style="{StaticResource LucideIcon}" Stroke="#52647E"/>
+                    </Viewbox>
+                    <TextBlock Text="Cancel"/>
+                </StackPanel>
+            </Button>
+            <Button Style="{StaticResource PrimaryButton}" IsDefault="True" MinWidth="126" Click="Save_Click">
+                <StackPanel Orientation="Horizontal">
+                    <Viewbox Width="15" Height="15" Margin="0,0,7,0">
+                        <Path Data="{StaticResource LucideSave}" Style="{StaticResource LucideIcon}" Stroke="White"/>
+                    </Viewbox>
+                    <TextBlock Text="Save SCL"/>
+                </StackPanel>
+            </Button>
         </StackPanel>
     </Grid>
 </Window>
diff --git a/SaveSclWindow.xaml.cs b/SaveSclWindow.xaml.cs
index 2dd67e56..5092859a 100644
--- a/SaveSclWindow.xaml.cs
+++ b/SaveSclWindow.xaml.cs
@@ -1,10 +1,17 @@
+using System.ComponentModel;
+using System.Runtime.CompilerServices;
 using System.Windows;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
 using AR.Iec61850.Scl.Export;
 
 namespace ArIED61850Tester;
 
-public sealed class SaveSclDialogViewModel
+public sealed class SaveSclDialogViewModel : INotifyPropertyChanged
 {
+    private SclSchemaProfileDescriptor _selectedSchemaProfile;
+    private string _editionHint = string.Empty;
+
     public SaveSclDialogViewModel(
         string iedName,
         string sourceDescription,
@@ -14,22 +21,63 @@ public SaveSclDialogViewModel(
         SourceDescription = string.IsNullOrWhiteSpace(sourceDescription)
             ? "IEC 61850 model"
             : sourceDescription.Trim();
-        SchemaProfiles =
-        [
-            SclSchemaProfiles.Get(SclSchemaProfile.Edition2V31),
-            SclSchemaProfiles.Get(SclSchemaProfile.Edition1V16)
-        ];
-        SelectedSchemaProfile = SclSchemaProfiles.Get(selectedProfile);
+        _selectedSchemaProfile = SclSchemaProfiles.Get(selectedProfile);
+        UpdateHint();
     }
 
+    public event PropertyChangedEventHandler? PropertyChanged;
+
     public string IedName { get; }
     public string SourceDescription { get; }
-    public IReadOnlyList<SclSchemaProfileDescriptor> SchemaProfiles { get; }
-    public SclSchemaProfileDescriptor SelectedSchemaProfile { get; set; }
+
+    public SclSchemaProfileDescriptor SelectedSchemaProfile
+    {
+        get => _selectedSchemaProfile;
+        private set
+        {
+            if (_selectedSchemaProfile.Profile == value.Profile)
+                return;
+            _selectedSchemaProfile = value;
+            OnPropertyChanged();
+            UpdateHint();
+        }
+    }
+
+    public string EditionHint
+    {
+        get => _editionHint;
+        private set
+        {
+            if (string.Equals(_editionHint, value, StringComparison.Ordinal))
+                return;
+            _editionHint = value;
+            OnPropertyChanged();
+        }
+    }
+
+    public bool IsEdition2 => SelectedSchemaProfile.IsEdition2;
+
+    public void Select(SclSchemaProfile profile)
+    {
+        SelectedSchemaProfile = SclSchemaProfiles.Get(profile);
+        OnPropertyChanged(nameof(IsEdition2));
+    }
+
+    private void UpdateHint()
+    {
+        EditionHint = SelectedSchemaProfile.IsEdition2
+            ? "Recommended for modern engineering exchange. The output is saved as an IID file."
+            : "Use for legacy engineering systems that require Edition 1. The output is saved as an ICD file.";
+    }
+
+    private void OnPropertyChanged([CallerMemberName] string? propertyName = null)
+        => PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
 }
 
 public partial class SaveSclWindow : Window
 {
+    private const double IndicatorOffset = 192d;
+
     public SaveSclWindow(
         string iedName,
         string sourceDescription,
@@ -41,6 +89,42 @@ public SaveSclWindow(
 
     public SaveSclDialogViewModel ViewModel => (SaveSclDialogViewModel)DataContext;
 
+    private void Window_Loaded(object sender, RoutedEventArgs e)
+        => ApplyEditionVisuals(animate: false);
+
+    private void Edition2_Click(object sender, RoutedEventArgs e)
+    {
+        ViewModel.Select(SclSchemaProfile.Edition2V31);
+        ApplyEditionVisuals(animate: true);
+    }
+
+    private void Edition1_Click(object sender, RoutedEventArgs e)
+    {
+        ViewModel.Select(SclSchemaProfile.Edition1V16);
+        ApplyEditionVisuals(animate: true);
+    }
+
+    private void ApplyEditionVisuals(bool animate)
+    {
+        var target = ViewModel.IsEdition2 ? 0d : IndicatorOffset;
+        Edition2Button.Foreground = ViewModel.IsEdition2 ? Brushes.White : new SolidColorBrush(Color.FromRgb(52, 64, 84));
+        Edition1Button.Foreground = ViewModel.IsEdition2 ? new SolidColorBrush(Color.FromRgb(52, 64, 84)) : Brushes.White;
+
+        if (!animate)
+        {
+            EditionIndicatorTranslate.X = target;
+            return;
+        }
+
+        var animation = new DoubleAnimation
+        {
+            To = target,
+            Duration = TimeSpan.FromMilliseconds(185),
+            EasingFunction = new CubicEase { EasingMode = EasingMode.EaseOut }
+        };
+        EditionIndicatorTranslate.BeginAnimation(TranslateTransform.XProperty, animation, HandoffBehavior.SnapshotAndReplace);
+    }
+
     private void Save_Click(object sender, RoutedEventArgs e)
         => DialogResult = true;
 }
diff --git a/scripts/publish-windows-portable.ps1 b/scripts/publish-windows-portable.ps1
index cf27f3bc..1cecb2e6 100644
--- a/scripts/publish-windows-portable.ps1
+++ b/scripts/publish-windows-portable.ps1
@@ -1,5 +1,5 @@
 param(
-    [string]$Version = "1.6.10",
+    [string]$Version = "1.6.11",
     [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.10 or v1.6.10."
+    throw "Invalid version '$Version'. Use a value such as 1.6.11 or v1.6.11."
 }
 
 $outputRoot = Join-Path $root "dist"