diff --git a/BrowserBatchWriteWindow.xaml b/BrowserBatchWriteWindow.xaml
index 3597b69cf..58628b96a 100644
--- a/BrowserBatchWriteWindow.xaml
+++ b/BrowserBatchWriteWindow.xaml
@@ -1,8 +1,8 @@
 <Window x:Class="ArIED61850Tester.BrowserBatchWriteWindow"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        Title="Write selected Data Attributes · ARSAS"
-        Width="760" Height="580" MinWidth="650" MinHeight="420" MaxHeight="690"
+        Title="Write Data to IED"
+        Width="660" Height="490" MinWidth="570" MinHeight="360" MaxHeight="700"
         WindowStartupLocation="CenterOwner" ResizeMode="CanResize"
         Background="#F5F7FA" FontFamily="{StaticResource AppFontFamily}" FontSize="11.5"
         Loaded="Window_Loaded" Closed="Window_Closed">
@@ -14,15 +14,15 @@
             <RowDefinition Height="Auto"/>
         </Grid.RowDefinitions>
         <StackPanel Grid.Row="0" Margin="2,0,2,10">
-            <TextBlock Text="Write selected Data Attributes" Foreground="#293E56"
+            <TextBlock Text="Write Data to IED" Foreground="#293E56"
                        FontWeight="SemiBold" FontSize="15"/>
             <TextBlock x:Name="IdentityLabel" Foreground="#5F7389" FontSize="11"
                        TextTrimming="CharacterEllipsis" Margin="0,3,0,0"/>
             <TextBlock Text="One verified DO · exact FC/type · no IEC Control Operate"
                        Foreground="#637990" FontSize="10.5" Margin="0,3,0,0"/>
         </StackPanel>
-        <TextBlock Grid.Row="1" Text="Select individual rows, enter new values and inspect the live MMS type before confirming. Writes are sequential, never atomic."
-                   TextWrapping="Wrap" Foreground="#596D84" FontSize="10.5" Margin="2,0,2,9"/>
+        <TextBlock Grid.Row="1" Text="Check attributes and choose values. Inspect verifies the current IED types before Write."
+                   TextTrimming="CharacterEllipsis" Foreground="#596D84" FontSize="10.5" Margin="2,0,2,7"/>
         <DataGrid x:Name="RowsGrid" Grid.Row="2" ItemsSource="{Binding Rows}"
                   Style="{StaticResource ModernDataGrid}" IsReadOnly="False"
                   AutoGenerateColumns="False" CanUserAddRows="False" CanUserDeleteRows="False"
@@ -32,30 +32,36 @@
                   VirtualizingPanel.IsVirtualizing="True" VirtualizingPanel.VirtualizationMode="Recycling"
                   EnableRowVirtualization="True">
             <DataGrid.Columns>
-                <DataGridTemplateColumn Header="Write" Width="53">
+                <DataGridTemplateColumn Header=" " Width="36">
                     <DataGridTemplateColumn.CellTemplate>
                         <DataTemplate>
-                            <CheckBox HorizontalAlignment="Center" VerticalAlignment="Center"
-                                      IsChecked="{Binding Selected, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                                      IsEnabled="{Binding Eligible}" ToolTip="{Binding Status}"/>
+                            <CheckBox IsChecked="{Binding Selected, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                                      IsEnabled="{Binding Eligible}" VerticalAlignment="Center"
+                                      HorizontalAlignment="Center" ToolTip="{Binding Status}"/>
                         </DataTemplate>
                     </DataGridTemplateColumn.CellTemplate>
                 </DataGridTemplateColumn>
-                <DataGridTextColumn Header="DA (exact MMS)" Binding="{Binding ReferenceText}"
-                                    IsReadOnly="True" Width="2.4*" MinWidth="220"/>
-                <DataGridTextColumn Header="FC" Binding="{Binding Fc}" IsReadOnly="True" Width="45"/>
-                <DataGridTextColumn Header="MMS type" Binding="{Binding Type}" IsReadOnly="True" Width="89"/>
-                <DataGridTextColumn Header="Before" Binding="{Binding Old}" IsReadOnly="True" Width="90"/>
-                <DataGridTemplateColumn Header="New value" Width="1.1*" MinWidth="108">
+                <DataGridTextColumn Header="Data Attribute" Binding="{Binding DisplayName}"
+                                    Width="2*" MinWidth="145" IsReadOnly="True"/>
+                <DataGridTextColumn Header="FC" Binding="{Binding Fc}" Width="43" IsReadOnly="True"/>
+                <DataGridTextColumn Header="Current" Binding="{Binding Old}" Width="1*" IsReadOnly="True"/>
+                <DataGridTemplateColumn Header="Value" Width="1.3*" MinWidth="120">
                     <DataGridTemplateColumn.CellTemplate>
                         <DataTemplate>
-                            <TextBox Text="{Binding NewValue, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                                     IsEnabled="{Binding Eligible}" Padding="5,3" FontSize="11"/>
+                            <Grid>
+                                <TextBox Text="{Binding NewValue, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                                         IsEnabled="{Binding CanEdit}" Visibility="{Binding TextEditorVisibility}"
+                                         Padding="6,3" ToolTip="{Binding Status}"/>
+                                <ComboBox ItemsSource="{Binding BooleanChoices}"
+                                          SelectedItem="{Binding NewValue, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                                          Visibility="{Binding BooleanEditorVisibility}"
+                                          IsEnabled="{Binding CanEdit}" Padding="5,1"/>
+                            </Grid>
                         </DataTemplate>
                     </DataGridTemplateColumn.CellTemplate>
                 </DataGridTemplateColumn>
-                <DataGridTextColumn Header="Result / reason" Binding="{Binding Status}"
-                                    IsReadOnly="True" Width="1.7*" MinWidth="145"/>
+                <DataGridTextColumn Header="Status" Binding="{Binding Status}"
+                                    Width="1.4*" MinWidth="120" IsReadOnly="True"/>
             </DataGrid.Columns>
         </DataGrid>
         <Grid Grid.Row="3" Margin="1,10,1,0">
@@ -72,14 +78,14 @@
                     <ColumnDefinition Width="Auto"/>
                     <ColumnDefinition Width="Auto"/>
                 </Grid.ColumnDefinitions>
-                <TextBlock Grid.Column="0" Text="A confirmed Write is not physical feedback."
+                <TextBlock Grid.Column="0" Text="Writes are sequential."
                            Foreground="#70849B" FontSize="10" TextWrapping="Wrap"
                            VerticalAlignment="Center" Margin="0,0,8,0"/>
-                <Button x:Name="InspectButton" Grid.Column="1" Content="Inspect selected"
-                        Style="{StaticResource SoftButton}" Width="117" Height="31"
+                <Button x:Name="InspectButton" Grid.Column="1" Content="Inspect"
+                        Style="{StaticResource SoftButton}" Width="89" Height="31"
                         Margin="0,0,7,0" Click="Inspect_Click"/>
-                <Button x:Name="WriteButton" Grid.Column="2" Content="Write selected…"
-                        Width="118" Height="31" IsEnabled="False" Background="#255F99"
+                <Button x:Name="WriteButton" Grid.Column="2" Content="Write"
+                        Width="94" Height="31" IsEnabled="False" Background="#255F99"
                         Foreground="White" BorderBrush="#255F99"
                         Margin="0,0,7,0" Click="Write_Click"/>
                 <Button Grid.Column="3" Content="Close" Width="72" Height="31"
diff --git a/BrowserBatchWriteWindow.xaml.cs b/BrowserBatchWriteWindow.xaml.cs
index da9bd4413..f9b082d34 100644
--- a/BrowserBatchWriteWindow.xaml.cs
+++ b/BrowserBatchWriteWindow.xaml.cs
@@ -106,8 +106,8 @@ private void SetBusy(bool busy)
     private void Window_Loaded(object sender, RoutedEventArgs e)
     {
         var work = SystemParameters.WorkArea;
-        Height = Math.Max(MinHeight, Math.Min(580, work.Height - 26));
-        Width = Math.Max(MinWidth, Math.Min(760, work.Width - 26));
+        Height = Math.Max(MinHeight, Math.Min(490, work.Height - 26));
+        Width = Math.Max(MinWidth, Math.Min(660, work.Width - 26));
     }
 
     private BrowserBatchWriteRow[] CheckedRows()
@@ -142,6 +142,7 @@ private async void Inspect_Click(object sender, RoutedEventArgs e)
                     throw new InvalidOperationException("IED association changed during inspection.");
                 StatusLabel.Text = $"Read-only inspect {i + 1}/{selected.Length}: {row.ReferenceText}";
                 row.Preview = null;
+                row.NotifyEditorChanged();
                 var preview = await _runtime.PreviewBrowserDataAttributeWriteAsync(
                     _device, row.Reference!.Value, _lifetime.Token);
                 if (!CurrentAssociation)
@@ -149,6 +150,7 @@ private async void Inspect_Click(object sender, RoutedEventArgs e)
                 row.Preview = preview.IsAvailable ? preview : null;
                 row.Type = preview.Type?.MmsType ?? "unverified";
                 row.Old = preview.CurrentText;
+                row.ApplyLiveEditor(preview.Type?.MmsType == "boolean", preview.CurrentText);
                 row.Status = preview.Message;
                 if (row.Preview is null)
                 {
@@ -270,6 +272,7 @@ private async void Write_Click(object sender, RoutedEventArgs e)
                 selected[i].Status = result.Rows[i].State?.ToString() ?? "Unattempted";
                 selected[i].Status += ": " + result.Rows[i].Message;
                 selected[i].Preview = null;
+                selected[i].NotifyEditorChanged();
             }
             StatusLabel.Text =
                 $"Readback verified: {result.Verified}; rejected: {result.Rejected}; " +
@@ -302,15 +305,17 @@ private async void Write_Click(object sender, RoutedEventArgs e)
 public sealed class BrowserBatchWriteRow : INotifyPropertyChanged
 {
     private bool _selected;
-    private string _newValue = "";
+    private string _newValue = "Inspect first";
     private string _status;
     private string _type = "Inspect first";
     private string _old = "—";
 
     public MmsObjectReference? Reference { get; }
     public string ReferenceText { get; }
+    public string DisplayName { get; }
     public string Fc { get; }
     public bool Eligible { get; }
+    public bool CanEdit => Eligible && Preview is { IsAvailable: true, Type: not null };
     public bool HasEdited { get; private set; }
     public IedBrowserNativeWritePreview? Preview { get; set; }
     public event PropertyChangedEventHandler? PropertyChanged;
@@ -321,11 +326,34 @@ public BrowserBatchWriteRow(
     {
         Reference = reference;
         ReferenceText = referenceText;
+        DisplayName = referenceText.Split((char)36).LastOrDefault() ?? referenceText;
         Fc = fc;
         Eligible = eligible;
         _status = reason;
     }
 
+    public void NotifyEditorChanged() => Changed(nameof(CanEdit));
+    public IReadOnlyList<string> BooleanChoices { get; } = new[] { "true", "false" };
+    public Visibility BooleanEditorVisibility => _booleanEditor ? Visibility.Visible : Visibility.Collapsed;
+    public Visibility TextEditorVisibility => _booleanEditor ? Visibility.Collapsed : Visibility.Visible;
+    private bool _booleanEditor;
+
+    public void ApplyLiveEditor(bool boolean, string actualValue)
+    {
+        if (_booleanEditor != boolean)
+        {
+            _booleanEditor = boolean;
+            Changed(nameof(BooleanEditorVisibility));
+            Changed(nameof(TextEditorVisibility));
+        }
+        if (!HasEdited && !string.IsNullOrWhiteSpace(actualValue))
+        {
+            _newValue = actualValue;
+            Changed(nameof(NewValue));
+        }
+        Changed(nameof(CanEdit));
+    }
+
     public bool Selected
     {
         get => _selected;
diff --git a/BrowserDataWriteWindow.xaml b/BrowserDataWriteWindow.xaml
index 63664c816..064eede2a 100644
--- a/BrowserDataWriteWindow.xaml
+++ b/BrowserDataWriteWindow.xaml
@@ -1,85 +1,79 @@
 <Window x:Class="ArIED61850Tester.BrowserDataWriteWindow"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        Title="Write Data to IED • MMS" Width="540" Height="445"
-        MinWidth="470" MinHeight="390" MaxHeight="680"
+        Title="Write Data to IED" Width="540" Height="315"
+        MinWidth="480" MinHeight="295" MaxHeight="440"
         WindowStartupLocation="CenterOwner" ResizeMode="CanResize"
-        Background="#F5F7FA" FontFamily="Segoe UI" FontSize="12"
+        Background="#F7F9FC" FontFamily="{StaticResource AppFontFamily}" FontSize="11.5"
         Loaded="Window_Loaded" Closed="Window_Closed">
-    <Grid Margin="18,12,18,13">
+    <Grid Margin="15,13,15,12">
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto"/>
             <RowDefinition Height="*"/>
             <RowDefinition Height="Auto"/>
         </Grid.RowDefinitions>
-        <StackPanel Grid.Row="0" Margin="0,0,0,12">
-            <TextBlock Text="Write Data to IED" FontSize="17" FontWeight="SemiBold" Foreground="#263C55"/>
-            <TextBlock Text="Exact live MMS type • single Data Attribute • no control Operate"
-                       Foreground="#66798E" Margin="0,3,0,0" FontSize="11"/>
-        </StackPanel>
-        <Border Grid.Row="1" Background="White" BorderBrush="#DCE3EC"
-                BorderThickness="1" CornerRadius="9">
-            <ScrollViewer VerticalScrollBarVisibility="Auto">
-                <StackPanel Margin="15,12,15,13">
-                    <TextBlock Text="IED / FC / Attribute" FontWeight="SemiBold"
-                               Foreground="#607187" FontSize="11"/>
-                    <TextBlock x:Name="ReferenceLabel" Margin="0,3,0,10"
-                               Foreground="#293F5B" TextWrapping="Wrap"/>
-                    <Grid>
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="1*"/>
-                            <ColumnDefinition Width="1*"/>
-                        </Grid.ColumnDefinitions>
-                        <StackPanel>
-                            <TextBlock Text="Live MMS type" Foreground="#607187" FontSize="11"/>
-                            <TextBlock x:Name="TypeLabel" Text="Not inspected"
-                                       Foreground="#2C4665" Margin="0,3,0,0"/>
-                        </StackPanel>
-                        <StackPanel Grid.Column="1">
-                            <TextBlock Text="Live current value" Foreground="#607187" FontSize="11"/>
-                            <TextBlock x:Name="CurrentLabel" Text="—" FontWeight="SemiBold"
-                                       Foreground="#253C56" Margin="0,3,0,0"
-                                       TextTrimming="CharacterEllipsis"/>
-                        </StackPanel>
+        <TextBlock x:Name="ReferenceLabel" Grid.Row="0" Margin="2,0,2,10"
+                   Foreground="#2A435F" FontFamily="{StaticResource AppCodeFontFamily}"
+                   TextTrimming="CharacterEllipsis" ToolTip="{Binding Text, RelativeSource={RelativeSource Self}}"/>
+        <Border Grid.Row="1" Background="White" BorderBrush="#D8E1EC"
+                BorderThickness="1" CornerRadius="7" Padding="8">
+            <Grid>
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="Auto"/>
+                    <RowDefinition Height="Auto"/>
+                    <RowDefinition Height="*"/>
+                </Grid.RowDefinitions>
+                <Grid Background="#E9EEF5" Height="29">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="45*"/>
+                        <ColumnDefinition Width="55*"/>
+                    </Grid.ColumnDefinitions>
+                    <TextBlock Text="Name" Margin="9,0" VerticalAlignment="Center" Foreground="#52667B"/>
+                    <TextBlock Grid.Column="1" Text="Value" Margin="9,0" VerticalAlignment="Center" Foreground="#52667B"/>
+                </Grid>
+                <Grid Grid.Row="1" Height="37" Background="#F5F8FC">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="45*"/>
+                        <ColumnDefinition Width="55*"/>
+                    </Grid.ColumnDefinitions>
+                    <StackPanel Orientation="Horizontal" VerticalAlignment="Center" Margin="8,0">
+                        <TextBlock Text="DA" Foreground="#226EB9" FontWeight="SemiBold" Margin="0,0,7,0"/>
+                        <TextBlock x:Name="AttributeLabel" Text="Value" Foreground="#293D54" VerticalAlignment="Center"/>
+                        <TextBlock x:Name="TypeLabel" Foreground="#76879B" FontSize="10" Margin="6,0,0,0"
+                                   VerticalAlignment="Center"/>
+                    </StackPanel>
+                    <Grid Grid.Column="1" Margin="4,3,5,3">
+                        <ComboBox x:Name="BoolPicker" Visibility="Collapsed" Height="29"
+                                  SelectionChanged="BoolPicker_SelectionChanged" IsEnabled="False">
+                            <ComboBoxItem Content="true" Tag="true"/>
+                            <ComboBoxItem Content="false" Tag="false"/>
+                        </ComboBox>
+                        <TextBox x:Name="NewValueBox" Height="29" Padding="7,4"
+                                 IsEnabled="False" VerticalContentAlignment="Center"
+                                 TextChanged="NewValueBox_TextChanged"/>
                     </Grid>
-                    <Border Height="1" Background="#E7EBF0" Margin="0,14,0,13"/>
-                    <TextBlock Text="New value" Foreground="#42566D" FontWeight="SemiBold"/>
-                    <TextBox x:Name="NewValueBox" Height="30" Margin="0,7,0,3"
-                             Padding="8,5" IsEnabled="False" FontSize="12"
-                             VerticalContentAlignment="Center"
-                             BorderBrush="#C5D2E1"
-                             TextChanged="NewValueBox_TextChanged"/>
-                    <TextBlock Text="Numbers use a dot as decimal separator. Values are validated against exact live MMS type."
-                               Foreground="#72859A" TextWrapping="Wrap" FontSize="10.5"/>
-                    <Border Background="#F2F6FB" BorderBrush="#DCE6F3"
-                            BorderThickness="1" CornerRadius="6" Padding="9,8"
-                            Margin="0,13,0,0">
-                        <StackPanel>
-                            <TextBlock Text="Wire preview" Foreground="#56708E" FontWeight="SemiBold" FontSize="11"/>
-                            <TextBlock x:Name="DiffLabel" Text="Read-only GVA inspection required."
-                                       Foreground="#344C68" Margin="0,4,0,0" TextWrapping="Wrap"/>
-                        </StackPanel>
-                    </Border>
+                </Grid>
+                <StackPanel Grid.Row="2" Margin="8,10,8,2">
+                    <TextBlock x:Name="CurrentLabel" Text="Reading IED…" Foreground="#597087" FontSize="10.5"/>
+                    <TextBlock x:Name="DiffLabel" Text="" Foreground="#55738D"
+                               TextWrapping="Wrap" FontSize="10.5" Margin="0,5,0,0"/>
                 </StackPanel>
-            </ScrollViewer>
+            </Grid>
         </Border>
-        <Grid Grid.Row="2" Margin="0,12,0,0">
+        <Grid Grid.Row="2" Margin="2,10,2,0">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="*"/>
                 <ColumnDefinition Width="Auto"/>
                 <ColumnDefinition Width="Auto"/>
             </Grid.ColumnDefinitions>
-            <TextBlock x:Name="StatusLabel" Foreground="#536981"
-                       VerticalAlignment="Center" TextWrapping="Wrap"
-                       FontSize="11" Margin="0,0,10,0"
-                       Text="Read-only inspection starting…"/>
-            <Button Grid.Column="1" Content="Close" Width="76" Height="30"
-                    Background="White" BorderBrush="#CAD5E2" Foreground="#344960"
-                    Margin="0,0,7,0" Click="Close_Click"/>
-            <Button x:Name="WriteButton" Grid.Column="2"
-                    Content="Write…" Width="88" Height="30" IsEnabled="False"
-                    Background="#255F99" Foreground="White" BorderBrush="#255F99"
-                    FontWeight="SemiBold" Click="Write_Click"/>
+            <TextBlock x:Name="StatusLabel" Text="Reading live MMS type…"
+                       Foreground="#61758A" TextTrimming="CharacterEllipsis"
+                       VerticalAlignment="Center" FontSize="10.5" Margin="0,0,9,0"/>
+            <Button x:Name="WriteButton" Grid.Column="1" Content="Write"
+                    Width="90" Height="31" IsEnabled="False"
+                    Style="{StaticResource PrimaryButton}" Click="Write_Click" Margin="0,0,7,0"/>
+            <Button Grid.Column="2" Content="Cancel" Width="84" Height="31"
+                    Style="{StaticResource SoftButton}" Click="Close_Click"/>
         </Grid>
     </Grid>
 </Window>
diff --git a/BrowserDataWriteWindow.xaml.cs b/BrowserDataWriteWindow.xaml.cs
index 5a326d4ed..9cdbd3ce8 100644
--- a/BrowserDataWriteWindow.xaml.cs
+++ b/BrowserDataWriteWindow.xaml.cs
@@ -31,7 +31,8 @@ public BrowserDataWriteWindow(
         ArgumentNullException.ThrowIfNull(attribute);
         _reference = MmsObjectReference.Parse(
             attribute.MmsReference, attribute.FunctionalConstraint);
-        ReferenceLabel.Text = $"{_device.Name}  •  {_reference.Domain}/{_reference.Item}  [{_reference.FunctionalConstraint}]";
+        ReferenceLabel.Text = $"{_device.Name}  •  {_reference.Domain}/{_reference.Item}";
+        AttributeLabel.Text = _reference.Item.Split((char)36).LastOrDefault() ?? "Value";
     }
 
     private async void Window_Loaded(object sender, RoutedEventArgs e)
@@ -49,7 +50,7 @@ private async void Window_Loaded(object sender, RoutedEventArgs e)
                 return;
             }
 
-            CurrentLabel.Text = p.CurrentText;
+            CurrentLabel.Text = $"Current: {p.CurrentText}";
             TypeLabel.Text = p.Type.SclBType.Length > 0
                 ? $"{p.Type.SclBType} ({p.Type.MmsType}, {p.Type.Size?.ToString() ?? "?"})"
                 : $"{p.Type.MmsType} ({p.Type.Size?.ToString() ?? "?"})";
@@ -59,12 +60,22 @@ private async void Window_Loaded(object sender, RoutedEventArgs e)
                 "floating-point" when p.Type.Size == 32 => true,
                 _ => false
             };
-            NewValueBox.IsEnabled = supported;
-            StatusLabel.Text = supported
-                ? "Live GVA/read verified. Enter a new value and inspect the diff."
-                : "This MMS wire type has no qualified typed text editor.";
-            DiffLabel.Text = $"Current: {p.CurrentText}\nNew: —\nFC={_reference.FunctionalConstraint} · GVA locked to this association.";
-            if (supported) NewValueBox.Focus();
+            var boolean = p.Type.MmsType == "boolean";
+            BoolPicker.Visibility = boolean ? Visibility.Visible : Visibility.Collapsed;
+            NewValueBox.Visibility = boolean ? Visibility.Collapsed : Visibility.Visible;
+            if (boolean)
+            {
+                BoolPicker.SelectedIndex = p.CurrentText.Equals("true", StringComparison.OrdinalIgnoreCase) ? 0 : 1;
+                BoolPicker.IsEnabled = supported;
+            }
+            else
+            {
+                NewValueBox.Text = p.CurrentText;
+                NewValueBox.IsEnabled = supported;
+            }
+            StatusLabel.Text = supported ? "Choose a value, then Write" : "Unsupported live MMS type";
+            DiffLabel.Text = supported ? "No change" : "No qualified editor for this MMS type.";
+            if (supported && !boolean) NewValueBox.SelectAll();
         }
         catch (OperationCanceledException)
         {
@@ -83,18 +94,20 @@ private async void Window_Loaded(object sender, RoutedEventArgs e)
         }
     }
 
-    private void NewValueBox_TextChanged(object sender, TextChangedEventArgs e)
-        => RefreshInput();
+    private void NewValueBox_TextChanged(object sender, TextChangedEventArgs e) => RefreshInput();
+    private void BoolPicker_SelectionChanged(object sender, SelectionChangedEventArgs e) => RefreshInput();
+    private string SelectedInput() => BoolPicker.Visibility == Visibility.Visible
+        ? (BoolPicker.SelectedItem as ComboBoxItem)?.Tag?.ToString() ?? ""
+        : NewValueBox.Text;
 
     private void RefreshInput()
     {
-        if (WriteButton is null || DiffLabel is null || NewValueBox is null) return;
+        if (WriteButton is null || DiffLabel is null || NewValueBox is null || BoolPicker is null) return;
         WriteButton.IsEnabled = false;
         if (_busy || _preview is not { IsAvailable: true, Type: not null, OldValue: not null } p ||
-            !NewValueBox.IsEnabled)
+            !(BoolPicker.Visibility == Visibility.Visible ? BoolPicker.IsEnabled : NewValueBox.IsEnabled))
             return;
-        if (!IedBrowserTypedWriteInput.TryParse(p.Type, NewValueBox.Text,
-                out var value, out var error) || value is null)
+        if (!IedBrowserTypedWriteInput.TryParse(p.Type, SelectedInput(), out var value, out var error) || value is null)
         {
             DiffLabel.Text = error;
             return;
@@ -103,19 +116,10 @@ private void RefreshInput()
         {
             IsSuccess = true, Reference = _reference, TypeSpecification = p.Type
         };
-        var rejection = IedBrowserTypedWriteAdmission.RejectReason(
-            _reference, gva, p.GvaSignature, value);
-        if (rejection is not null)
-        {
-            DiffLabel.Text = rejection;
-            return;
-        }
-        var oldBytes = MmsDataCodec.Encode(p.OldValue);
-        var newBytes = MmsDataCodec.Encode(value);
-        var changed = !oldBytes.AsSpan().SequenceEqual(newBytes);
-        DiffLabel.Text = $"Current: {p.CurrentText}\nNew: {MmsDataCodec.ToDisplayString(value)}\n" +
-                         $"FC={_reference.FunctionalConstraint} · " +
-                         (changed ? "One exact DA will be written." : "No change; Write disabled.");
+        var rejection = IedBrowserTypedWriteAdmission.RejectReason(_reference, gva, p.GvaSignature, value);
+        if (rejection is not null) { DiffLabel.Text = rejection; return; }
+        var changed = !MmsDataCodec.Encode(p.OldValue).AsSpan().SequenceEqual(MmsDataCodec.Encode(value));
+        DiffLabel.Text = changed ? p.CurrentText + " → " + MmsDataCodec.ToDisplayString(value) : "No change";
         WriteButton.IsEnabled = changed;
     }
 
@@ -123,7 +127,7 @@ private async void Write_Click(object sender, RoutedEventArgs e)
     {
         if (_busy || _preview is not { IsAvailable: true, Type: not null, OldValue: not null } p ||
             !WriteButton.IsEnabled ||
-            !IedBrowserTypedWriteInput.TryParse(p.Type, NewValueBox.Text,
+            !IedBrowserTypedWriteInput.TryParse(p.Type, SelectedInput(),
                 out var proposed, out _) || proposed is null)
             return;
         var gva = new MmsVariableAccessAttributesResult
@@ -153,7 +157,8 @@ private async void Write_Click(object sender, RoutedEventArgs e)
         _busy = true;
         WriteButton.IsEnabled = false;
         NewValueBox.IsEnabled = false;
-        StatusLabel.Text = "One exact MMS Write requested…";
+        BoolPicker.IsEnabled = false;
+        StatusLabel.Text = "Writing…";
         try
         {
             var step = new IedBrowserTypedWriteStep(
diff --git a/MainWindow.IedBrowser.TypedDataWrite.cs b/MainWindow.IedBrowser.TypedDataWrite.cs
index b132804fe..b022a0a2e 100644
--- a/MainWindow.IedBrowser.TypedDataWrite.cs
+++ b/MainWindow.IedBrowser.TypedDataWrite.cs
@@ -127,8 +127,8 @@ private void RefreshIedBrowserWriteButton()
         var selectedDo = ctlModel is null && selected is null ? BrowserWritableSelectedDo() : null;
         IedBrowserWriteButton.IsEnabled =
             ctlModel is not null || selected is not null || selectedDo is not null;
-        IedBrowserWriteButton.Content = ctlModel is not null ? "Write ctlModel…" :
-            selectedDo is not null ? "Write DAs…" : "Write DA…";
+        // Keep the Material-pencil + Write visual from XAML intact.
+        // Refresh selection changes only Enabled/ToolTip, never Button.Content.
         IedBrowserWriteButton.ToolTip = ctlModel is not null
             ? "Read live ctlModel, choose IEC enum 0–4, confirm a guarded CF Write and verify readback."
             : selected is not null
diff --git a/MainWindow.xaml b/MainWindow.xaml
index e4bc8ac63..d3e7e753e 100644
--- a/MainWindow.xaml
+++ b/MainWindow.xaml
@@ -2052,10 +2052,18 @@
                                         Style="{StaticResource SoftButton}" Margin="0,0,6,0"
                                         IsEnabled="False" Click="IedBrowserControl_Click"
                                         ToolTip="Only enabled when this online DO has an existing live-verified native IEC Control descriptor."/>
-                                <Button x:Name="IedBrowserWriteButton" Content="Write DA…"
-                                        Style="{StaticResource SoftButton}" Margin="0,0,6,0"
+                                <Button x:Name="IedBrowserWriteButton" Style="{StaticResource SoftButton}"
+                                        Margin="0,0,6,0" MinWidth="81"
                                         IsEnabled="False" Click="IedBrowserWrite_Click"
-                                        ToolTip="Select an online CF/SP/DC Data Attribute to inspect and explicitly confirm one typed MMS Write."/>
+                                        ToolTip="Write the selected Data Attribute or focused Data Object using the exact live MMS type.">
+                                    <StackPanel Orientation="Horizontal">
+                                        <Viewbox Width="15" Height="15" Margin="0,0,5,0" IsHitTestVisible="False">
+                                            <Path Width="960" Height="960" Fill="#345A83"
+                                                  Data="M167,840 Q146,845 130.5,829.5 T120,793 L160,602 358,800 167,840 Z M358,800 L160,602 618,144 Q641,121 675,121 T732,144 L816,228 Q839,251 839,285 T816,342 L358,800 Z M675,200 L261,614 346,699 760,285 675,200 Z"/>
+                                        </Viewbox>
+                                        <TextBlock Text="Write" VerticalAlignment="Center"/>
+                                    </StackPanel>
+                                </Button>
                                 <Button x:Name="IedBrowserReadPageButton" Content="Read" Tag="Page"
                                         Style="{StaticResource SoftButton}" Margin="0,0,6,0"
                                         Click="IedBrowserReadValues_Click"
diff --git a/tests/ARSAS.Tests/IedBrowserBatchWriteEditorTests.cs b/tests/ARSAS.Tests/IedBrowserBatchWriteEditorTests.cs
index 659379a26..116cc1351 100644
--- a/tests/ARSAS.Tests/IedBrowserBatchWriteEditorTests.cs
+++ b/tests/ARSAS.Tests/IedBrowserBatchWriteEditorTests.cs
@@ -84,8 +84,8 @@ public void StatusDaSelectionRevokesParentWriteAndControlAuthority()
         Assert.Contains(dataLeaf, write);
         Assert.Contains(dataLeaf, control);
         Assert.Contains("RefreshIedBrowserControlButton();", write);
-        Assert.Contains("IedBrowserWriteButton.Content = ctlModel is not null", write);
-        Assert.Contains("selectedDo is not null ? \"Write DAs…\" : \"Write DA…\"", write);
+        Assert.Contains("var ctlModel = BrowserSelectedControlModelSignal()", write);
+        Assert.DoesNotContain("IedBrowserWriteButton.Content =", write);
     }
 
     private static string Find(string relative)
diff --git a/tests/ARSAS.Tests/IedBrowserLiveControlWriteFatRegressionTests.cs b/tests/ARSAS.Tests/IedBrowserLiveControlWriteFatRegressionTests.cs
index 944d58b4e..93137f97d 100644
--- a/tests/ARSAS.Tests/IedBrowserLiveControlWriteFatRegressionTests.cs
+++ b/tests/ARSAS.Tests/IedBrowserLiveControlWriteFatRegressionTests.cs
@@ -43,7 +43,7 @@ public void CtlModelCfLeaf_UsesExistingGuardedWriteEditor_NotGenericMmsOrOperate
         Assert.Contains("source.Attributes.Any", ctx);
         Assert.Contains("new ControlModelWriteWindow(_runtime, device, modelSignal)", write);
         Assert.Contains("ctlModel requires the existing guarded ConfigureControlModel workflow", safety);
-        Assert.Contains("selectedDo is not null ? \"Write DAs…\" : \"Write DA…\"", write);
+        Assert.DoesNotContain("IedBrowserWriteButton.Content =", write);
     }
 
     [Fact]
diff --git a/tests/ARSAS.Tests/TypedWriteEditorUxRegressionTests.cs b/tests/ARSAS.Tests/TypedWriteEditorUxRegressionTests.cs
new file mode 100644
index 000000000..cec34b4fc
--- /dev/null
+++ b/tests/ARSAS.Tests/TypedWriteEditorUxRegressionTests.cs
@@ -0,0 +1,69 @@
+using System.Xml.Linq;
+
+namespace ARSAS.Tests;
+
+public sealed class TypedWriteEditorUxRegressionTests
+{
+    [Fact]
+    public void ToolbarWrite_IsStableAndHasRequestedMaterialPencilVector()
+    {
+        var xaml = Source("MainWindow.xaml");
+        Assert.Contains("x:Name=\"IedBrowserWriteButton\"", xaml);
+        Assert.Contains("Text=\"Write\"", xaml);
+        Assert.Contains("M167,840", xaml);
+        var route = Source("MainWindow.IedBrowser.TypedDataWrite.cs");
+        Assert.DoesNotContain("IedBrowserWriteButton.Content =", route);
+        Assert.DoesNotContain("Write ctlModel…\" :", route);
+    }
+
+    [Fact]
+    public void SingleDaEditor_HasInlineTypedDropdownAndNoEmptyBooleanInput()
+    {
+        var xaml = Source("BrowserDataWriteWindow.xaml");
+        XDocument.Parse(xaml);
+        Assert.Contains("x:Name=\"BoolPicker\"", xaml);
+        Assert.Contains("Content=\"true\"", xaml);
+        Assert.Contains("Content=\"false\"", xaml);
+        Assert.Contains("x:Name=\"NewValueBox\"", xaml);
+        Assert.Contains("Text=\"Name\"", xaml);
+        Assert.Contains("Text=\"Value\"", xaml);
+        Assert.Contains("Content=\"Write\"", xaml);
+        Assert.DoesNotContain("Wire preview", xaml);
+        var code = Source("BrowserDataWriteWindow.xaml.cs");
+        Assert.Contains("NewValueBox.Text = p.CurrentText", code);
+        Assert.Contains("BoolPicker.SelectedIndex", code);
+        Assert.Contains("SelectedInput()", code);
+        Assert.Contains("IedBrowserTypedWriteAdmission.RejectReason", code);
+        Assert.Contains("WriteBrowserDataAttributesAsync", code);
+    }
+
+    [Fact]
+    public void BatchEditor_BooleanPickerIsLiveGvaDriven_AndWriteHasNoAutomaticRetry()
+    {
+        var xaml = Source("BrowserBatchWriteWindow.xaml");
+        XDocument.Parse(xaml);
+        Assert.Contains("BooleanEditorVisibility", xaml);
+        Assert.Contains("IsEnabled=\"{Binding CanEdit}\"", xaml);
+        Assert.Contains("TextEditorVisibility", xaml);
+        Assert.Contains("DisplayName", xaml);
+        Assert.Contains("Content=\"Write\"", xaml);
+        Assert.DoesNotContain("Write selected…", xaml);
+        var code = Source("BrowserBatchWriteWindow.xaml.cs");
+        Assert.Contains("ApplyLiveEditor(preview.Type?.MmsType == \"boolean\"", code);
+        Assert.Contains("if (!HasEdited", code);
+        Assert.Contains("IedBrowserTypedWriteBatch.Freeze", code);
+        Assert.Contains("WriteBrowserDataAttributesAsync", code);
+    }
+
+    private static string Source(string filename)
+    {
+        var dir = new DirectoryInfo(AppContext.BaseDirectory);
+        while (dir != null)
+        {
+            var p = Path.Combine(dir.FullName, filename);
+            if (File.Exists(p)) return File.ReadAllText(p);
+            dir = dir.Parent;
+        }
+        throw new FileNotFoundException(filename);
+    }
+}