From 259661f9cca8b7d9756b4542922ecaa622b58b69 Mon Sep 17 00:00:00 2001
From: Amit <ak.nitrr13@gmail.com>
Date: Tue, 14 Jul 2026 09:18:44 +0800
Subject: [PATCH 1/2] Polish black-glass WPF surfaces

---
 SnipIT.ps1                  | 197 ++++++++++++++++++++++--------------
 Test-SnipIT-Interactive.ps1 | 156 ++++++++++++++++++++++++++--
 Test-SnipIT.ps1             |  13 +--
 src/00-Core.ps1             |   9 +-
 src/10-Bootstrap.ps1        |  10 +-
 src/40-Preview.ps1          |  30 ++++--
 xaml/AboutWindow.xaml       |   4 +-
 xaml/FloatingWidget.xaml    |   8 +-
 xaml/PreviewWindow.xaml     |  59 ++++++-----
 xaml/SettingsWindow.xaml    |   6 +-
 xaml/SmartOverlay.xaml      |  58 ++++++-----
 xaml/ThemeResources.xaml    |  13 ++-
 12 files changed, 400 insertions(+), 163 deletions(-)

diff --git a/SnipIT.ps1 b/SnipIT.ps1
index 74c8576..94d1129 100644
--- a/SnipIT.ps1
+++ b/SnipIT.ps1
@@ -1251,10 +1251,11 @@ function Invoke-CaptureLoop {
 
 function Get-SnipThemeTokens {
     [pscustomobject][ordered]@{
-        PageBlack = '#030405'; CanvasBlack = '#090A0C'; GlassScrim = '#CC000000'
-        GlassTop = '#260E1012'; GlassBottom = '#14050608'
-        PrimaryText = '#F2F5F7'; SecondaryText = '#C0C5CA'; MutedText = '#9EA4AA'
-        Hairline = '#59FFFFFF'; HoverFill = '#1FFFFFFF'; Accent = '#D8C8A5'
+        PageBlack = '#030405'; CanvasBlack = '#080A0C'; GlassScrim = '#E60A0C0E'
+        GlassTop = '#4050463B'; GlassBottom = '#26000000'
+        PrimaryText = '#F5F1E8'; SecondaryText = '#C7C2B8'; MutedText = '#938E84'
+        Hairline = '#80D8C8A5'; InnerHighlight = '#33F3EAD7'
+        HoverFill = '#24D8C8A5'; Accent = '#D8C8A5'
         AccentText = '#F3EAD7'; Coral = '#FF8069'; Mint = '#A8EFD7'
         Amber = '#FFD36B'; Violet = '#BBA1FF'
         IslandRadius = 16; ControlRadius = 10; CornerIslandHeight = 42
@@ -2555,7 +2556,7 @@ $script:SnipEmbeddedXaml = [ordered]@{
   <Style x:Key="SnipButtonStyle" TargetType="{x:Type Button}">
     <Setter Property="Foreground" Value="{DynamicResource SnipPrimaryTextBrush}"/>
     <Setter Property="Background" Value="Transparent"/>
-    <Setter Property="BorderBrush" Value="{DynamicResource SnipHairlineBrush}"/>
+    <Setter Property="BorderBrush" Value="{DynamicResource SnipQuietBorderBrush}"/>
     <Setter Property="BorderThickness" Value="1"/>
     <Setter Property="FontFamily" Value="{DynamicResource SnipTextFont}"/>
     <Setter Property="FontSize" Value="12"/>
@@ -2582,6 +2583,11 @@ $script:SnipEmbeddedXaml = [ordered]@{
           <ControlTemplate.Triggers>
             <Trigger Property="IsMouseOver" Value="True">
               <Setter TargetName="Surface" Property="Background" Value="{DynamicResource SnipHoverBrush}"/>
+              <Setter TargetName="Surface" Property="BorderBrush" Value="{DynamicResource SnipHairlineBrush}"/>
+            </Trigger>
+            <Trigger Property="IsPressed" Value="True">
+              <Setter TargetName="Surface" Property="Background" Value="{DynamicResource SnipAccentTintBrush}"/>
+              <Setter TargetName="Surface" Property="BorderBrush" Value="{DynamicResource SnipAccentBrush}"/>
             </Trigger>
             <Trigger Property="IsKeyboardFocused" Value="True">
               <Setter TargetName="FocusRing" Property="Visibility" Value="Visible"/>
@@ -2648,7 +2654,7 @@ $script:SnipEmbeddedXaml = [ordered]@{
     </Setter>
   </Style>
   <Style x:Key="SnipContextMenuStyle" TargetType="{x:Type ContextMenu}">
-    <Setter Property="Background" Value="{DynamicResource SnipCanvasBrush}"/>
+    <Setter Property="Background" Value="{DynamicResource SnipGlassScrimBrush}"/>
     <Setter Property="Foreground" Value="{DynamicResource SnipPrimaryTextBrush}"/>
     <Setter Property="BorderBrush" Value="{DynamicResource SnipHairlineBrush}"/>
     <Setter Property="BorderThickness" Value="1"/>
@@ -2673,7 +2679,7 @@ $script:SnipEmbeddedXaml = [ordered]@{
   </Style>
   <Style x:Key="SnipMenuItemStyle" TargetType="{x:Type MenuItem}">
     <Setter Property="Foreground" Value="{DynamicResource SnipPrimaryTextBrush}"/>
-    <Setter Property="Background" Value="{DynamicResource SnipCanvasBrush}"/>
+    <Setter Property="Background" Value="Transparent"/>
     <Setter Property="BorderBrush" Value="Transparent"/>
     <Setter Property="BorderThickness" Value="1"/>
     <Setter Property="FontFamily" Value="{DynamicResource SnipTextFont}"/>
@@ -2718,7 +2724,7 @@ $script:SnipEmbeddedXaml = [ordered]@{
                    Focusable="False" PopupAnimation="{DynamicResource SnipPopupAnimation}"
                    IsOpen="{Binding IsSubmenuOpen, RelativeSource={RelativeSource TemplatedParent}}">
               <Border x:Name="SubmenuSurface" CornerRadius="10" Padding="2"
-                      Background="{DynamicResource SnipCanvasBrush}"
+                      Background="{DynamicResource SnipGlassScrimBrush}"
                       BorderBrush="{DynamicResource SnipHairlineBrush}"
                       BorderThickness="1">
                 <ScrollViewer CanContentScroll="True"
@@ -2877,7 +2883,7 @@ $script:SnipEmbeddedXaml = [ordered]@{
       <Setter Property="Margin" Value="2,0"/>
       <Setter Property="Foreground" Value="{DynamicResource SnipPrimaryTextBrush}"/>
       <Setter Property="Background" Value="Transparent"/>
-      <Setter Property="BorderBrush" Value="{DynamicResource SnipHairlineBrush}"/>
+      <Setter Property="BorderBrush" Value="{DynamicResource SnipQuietBorderBrush}"/>
       <Setter Property="BorderThickness" Value="1"/><Setter Property="Cursor" Value="Hand"/>
       <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
       <Setter Property="Template"><Setter.Value><ControlTemplate TargetType="Button"><Grid>
@@ -2888,14 +2894,15 @@ $script:SnipEmbeddedXaml = [ordered]@{
         <Border x:Name="FocusRing" CornerRadius="10" BorderBrush="{DynamicResource SnipFocusBrush}"
                 BorderThickness="2" Visibility="Collapsed" IsHitTestVisible="False"/>
       </Grid><ControlTemplate.Triggers>
-        <Trigger Property="IsMouseOver" Value="True"><Setter TargetName="Surface" Property="Background" Value="{DynamicResource SnipHoverBrush}"/></Trigger>
+        <Trigger Property="IsMouseOver" Value="True"><Setter TargetName="Surface" Property="Background" Value="{DynamicResource SnipHoverBrush}"/><Setter TargetName="Surface" Property="BorderBrush" Value="{DynamicResource SnipHairlineBrush}"/></Trigger>
+        <Trigger Property="IsPressed" Value="True"><Setter TargetName="Surface" Property="Background" Value="{DynamicResource SnipAccentTintBrush}"/><Setter TargetName="Surface" Property="BorderBrush" Value="{DynamicResource SnipAccentBrush}"/></Trigger>
         <Trigger Property="IsKeyboardFocused" Value="True"><Setter TargetName="FocusRing" Property="Visibility" Value="Visible"/></Trigger>
       </ControlTemplate.Triggers></ControlTemplate></Setter.Value></Setter>
     </Style>
     <Style x:Key="StudioToolToggleStyle" TargetType="ToggleButton">
       <Setter Property="Width" Value="38"/><Setter Property="Height" Value="38"/>
       <Setter Property="Margin" Value="2,0"/><Setter Property="Foreground" Value="{DynamicResource SnipPrimaryTextBrush}"/>
-      <Setter Property="Background" Value="Transparent"/><Setter Property="BorderBrush" Value="{DynamicResource SnipHairlineBrush}"/>
+      <Setter Property="Background" Value="Transparent"/><Setter Property="BorderBrush" Value="{DynamicResource SnipQuietBorderBrush}"/>
       <Setter Property="BorderThickness" Value="1"/><Setter Property="Cursor" Value="Hand"/>
       <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
       <Setter Property="Template">
@@ -2909,7 +2916,7 @@ $script:SnipEmbeddedXaml = [ordered]@{
           <Border x:Name="FocusRing" CornerRadius="10" BorderBrush="{DynamicResource SnipFocusBrush}"
                   BorderThickness="2" Visibility="Collapsed" IsHitTestVisible="False"/>
         </Grid><ControlTemplate.Triggers>
-          <Trigger Property="IsMouseOver" Value="True"><Setter TargetName="Surface" Property="Background" Value="{DynamicResource SnipHoverBrush}"/></Trigger>
+          <Trigger Property="IsMouseOver" Value="True"><Setter TargetName="Surface" Property="Background" Value="{DynamicResource SnipHoverBrush}"/><Setter TargetName="Surface" Property="BorderBrush" Value="{DynamicResource SnipHairlineBrush}"/></Trigger>
           <Trigger Property="IsChecked" Value="True"><Setter TargetName="Surface" Property="Background" Value="{DynamicResource SnipAccentTintBrush}"/><Setter TargetName="Surface" Property="BorderBrush" Value="{DynamicResource SnipAccentBrush}"/><Setter TargetName="Indicator" Property="Visibility" Value="Visible"/></Trigger>
           <Trigger Property="IsKeyboardFocused" Value="True"><Setter TargetName="FocusRing" Property="Visibility" Value="Visible"/></Trigger>
         </ControlTemplate.Triggers></ControlTemplate></Setter.Value>
@@ -2939,12 +2946,19 @@ $script:SnipEmbeddedXaml = [ordered]@{
                 FocusVisualStyle="{StaticResource CanvasFocusVisualStyle}"/>
       </Grid>
     </ScrollViewer>
-    <Border x:Name="BrandIsland" Style="{StaticResource StudioIslandStyle}" Height="42" Width="250"
-            HorizontalAlignment="Left" VerticalAlignment="Top" Margin="30,24,0,0">
+    <Border x:Name="BrandIsland" Style="{StaticResource StudioIslandStyle}" Height="42" Width="292"
+            HorizontalAlignment="Left" VerticalAlignment="Top" Margin="28,24,0,0">
       <Grid x:Name="DragHeader" Background="Transparent">
         <Border CornerRadius="15" Background="{DynamicResource SnipGlassGradientBrush}"/>
         <StackPanel Orientation="Horizontal" VerticalAlignment="Center" Margin="13,0">
-          <TextBlock Text="SnipIT" FontWeight="SemiBold" Foreground="{DynamicResource SnipPrimaryTextBrush}"/>
+          <Border x:Name="BrandMark" Width="20" Height="20" CornerRadius="6"
+                  Margin="0,0,8,0" Background="{DynamicResource SnipAccentTintBrush}"
+                  BorderBrush="{DynamicResource SnipAccentBrush}" BorderThickness="1">
+            <TextBlock Text="+" FontSize="13" FontWeight="SemiBold"
+                       HorizontalAlignment="Center" VerticalAlignment="Center"
+                       Foreground="{DynamicResource SnipAccentTextBrush}"/>
+          </Border>
+          <TextBlock Text="SnipIT" FontSize="13" FontWeight="SemiBold" Foreground="{DynamicResource SnipPrimaryTextBrush}"/>
           <TextBlock Text="  ·  " Foreground="{DynamicResource SnipMutedTextBrush}"/>
           <TextBlock x:Name="DimText" FontFamily="{DynamicResource SnipCodeFont}" FontSize="11" Foreground="{DynamicResource SnipSecondaryTextBrush}"/>
           <TextBlock Text="  ·  " Foreground="{DynamicResource SnipMutedTextBrush}"/>
@@ -2952,53 +2966,58 @@ $script:SnipEmbeddedXaml = [ordered]@{
           <TextBlock Text="  ⠿" Foreground="{DynamicResource SnipMutedTextBrush}"/>
         </StackPanel>
         <Border x:Name="BrandInnerHighlight" Height="1" VerticalAlignment="Top"
-                Margin="2,0" Background="{DynamicResource SnipInnerHighlightBrush}"/>
+                Margin="12,1,12,0" Background="{DynamicResource SnipInnerHighlightBrush}"/>
       </Grid>
     </Border>
     <Border x:Name="ActionsIsland" Style="{StaticResource StudioIslandStyle}" Height="42"
-            HorizontalAlignment="Right" VerticalAlignment="Top" Margin="0,24,30,0" Padding="2">
+            HorizontalAlignment="Right" VerticalAlignment="Top" Margin="0,24,28,0" Padding="4,2">
       <Grid><Border CornerRadius="15" Background="{DynamicResource SnipGlassGradientBrush}"/>
         <StackPanel x:Name="ActionsPanel" Orientation="Horizontal" VerticalAlignment="Center"/>
         <Border x:Name="ActionsInnerHighlight" Height="1" VerticalAlignment="Top"
-                Margin="2,0" Background="{DynamicResource SnipInnerHighlightBrush}"/>
+                Margin="12,1,12,0" Background="{DynamicResource SnipInnerHighlightBrush}"/>
       </Grid>
     </Border>
     <Border x:Name="PropertyIsland" Style="{StaticResource StudioIslandStyle}" Height="54" Width="470"
-            HorizontalAlignment="Center" VerticalAlignment="Bottom" Margin="0,0,0,94" Padding="7">
+            HorizontalAlignment="Center" VerticalAlignment="Bottom" Margin="0,0,0,90" Padding="7">
       <Grid><Border CornerRadius="15" Background="{DynamicResource SnipGlassGradientBrush}"/>
         <StackPanel x:Name="PropertyPanel" Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center"/>
         <Border x:Name="PropertyInnerHighlight" Height="1" VerticalAlignment="Top"
-                Margin="2,0" Background="{DynamicResource SnipInnerHighlightBrush}"/>
+                Margin="12,1,12,0" Background="{DynamicResource SnipInnerHighlightBrush}"/>
       </Grid>
     </Border>
     <Border x:Name="ToolDock" Style="{StaticResource StudioIslandStyle}" Height="51"
-            HorizontalAlignment="Center" VerticalAlignment="Bottom" Margin="0,0,0,35" Padding="5">
+            HorizontalAlignment="Center" VerticalAlignment="Bottom" Margin="0,0,0,28" Padding="5">
       <Grid><Border CornerRadius="15" Background="{DynamicResource SnipGlassGradientBrush}"/>
         <StackPanel x:Name="ToolPanel" Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center"/>
         <Border x:Name="ToolDockInnerHighlight" Height="1" VerticalAlignment="Top"
-                Margin="2,0" Background="{DynamicResource SnipInnerHighlightBrush}"/>
+                Margin="12,1,12,0" Background="{DynamicResource SnipInnerHighlightBrush}"/>
       </Grid>
     </Border>
-    <Border x:Name="ViewportIsland" Style="{StaticResource StudioIslandStyle}" Height="42" Width="170"
-            HorizontalAlignment="Left" VerticalAlignment="Bottom" Margin="30,0,0,35" Padding="2">
+    <Border x:Name="ViewportIsland" Style="{StaticResource StudioIslandStyle}" Height="42" Width="216"
+            HorizontalAlignment="Left" VerticalAlignment="Bottom" Margin="28,0,0,28" Padding="3,2">
       <Grid><Border CornerRadius="15" Background="{DynamicResource SnipGlassGradientBrush}"/>
         <StackPanel x:Name="ViewportPanel" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center">
-          <TextBlock x:Name="CoordinateText" Text="x 0  y 0" FontFamily="{DynamicResource SnipCodeFont}" FontSize="10" Margin="3,0" Foreground="{DynamicResource SnipMutedTextBrush}"/>
+          <TextBlock x:Name="CoordinateText" Text="x 0  y 0" FontFamily="{DynamicResource SnipCodeFont}" FontSize="10" Margin="5,0" Foreground="{DynamicResource SnipMutedTextBrush}"/>
           <Button x:Name="ZoomOutBtn" Style="{StaticResource StudioToolButtonStyle}" Width="28" Height="32" AutomationProperties.Name="Zoom out" ToolTip="Zoom out (Ctrl+-)"><TextBlock Text="−"/></Button>
-          <TextBlock x:Name="ZoomText" Text="100%" Width="38" TextAlignment="Center" FontFamily="{DynamicResource SnipCodeFont}" FontSize="10" VerticalAlignment="Center" Foreground="{DynamicResource SnipPrimaryTextBrush}"/>
+          <TextBlock x:Name="ZoomText" Text="100%" Width="42" TextAlignment="Center" FontFamily="{DynamicResource SnipCodeFont}" FontSize="10" VerticalAlignment="Center" Foreground="{DynamicResource SnipPrimaryTextBrush}"/>
           <Button x:Name="ZoomInBtn" Style="{StaticResource StudioToolButtonStyle}" Width="28" Height="32" AutomationProperties.Name="Zoom in" ToolTip="Zoom in (Ctrl++)"><TextBlock Text="+"/></Button>
-          <Button x:Name="FitBtn" Style="{StaticResource StudioToolButtonStyle}" Width="32" Height="32" AutomationProperties.Name="Fit to viewport" ToolTip="Fit (Ctrl+0)"><TextBlock Text="Fit" FontSize="10"/></Button>
+          <Button x:Name="FitBtn" Style="{StaticResource StudioToolButtonStyle}" Width="36" Height="32" AutomationProperties.Name="Fit to viewport" ToolTip="Fit (Ctrl+0)"><TextBlock Text="Fit" FontSize="10"/></Button>
         </StackPanel>
         <Border x:Name="ViewportInnerHighlight" Height="1" VerticalAlignment="Top"
-                Margin="2,0" Background="{DynamicResource SnipInnerHighlightBrush}"/>
+                Margin="12,1,12,0" Background="{DynamicResource SnipInnerHighlightBrush}"/>
       </Grid>
     </Border>
     <Border x:Name="StatusIsland" Style="{StaticResource StudioIslandStyle}" Height="42" Width="150"
-            HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="0,0,30,35" Padding="10,0">
+            HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="0,0,28,28" Padding="10,0">
       <Grid><Border CornerRadius="15" Background="{DynamicResource SnipGlassGradientBrush}"/>
-        <TextBlock x:Name="StatusText" Text="Non-destructive edit" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="11" Foreground="{DynamicResource SnipSecondaryTextBrush}"/>
+        <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center">
+          <Ellipse x:Name="StatusIndicator" Width="5" Height="5" Margin="0,0,7,0"
+                   Fill="{DynamicResource SnipAccentBrush}"/>
+          <TextBlock x:Name="StatusText" Text="Non-destructive edit" FontSize="11"
+                     Foreground="{DynamicResource SnipSecondaryTextBrush}"/>
+        </StackPanel>
         <Border x:Name="StatusInnerHighlight" Height="1" VerticalAlignment="Top"
-                Margin="2,0" Background="{DynamicResource SnipInnerHighlightBrush}"/>
+                Margin="12,1,12,0" Background="{DynamicResource SnipInnerHighlightBrush}"/>
       </Grid>
     </Border>
     <Grid x:Name="HiddenLegacyControls" Visibility="Collapsed">
@@ -3034,27 +3053,31 @@ $script:SnipEmbeddedXaml = [ordered]@{
               BorderThickness="1" CornerRadius="16" Visibility="Collapsed">
         <Border Margin="1" CornerRadius="15"
                 Background="{DynamicResource SnipGlassGradientBrush}">
-          <StackPanel>
-            <Border Width="144" Height="144" Margin="12,12,12,5"
-                    BorderBrush="{DynamicResource SnipHairlineBrush}"
-                    BorderThickness="1" ClipToBounds="True">
-              <Grid>
-                <Image x:Name="LoupeImage" Stretch="None"
-                       RenderOptions.BitmapScalingMode="NearestNeighbor"/>
-                <Line X1="72" Y1="0" X2="72" Y2="144"
-                      Stroke="{DynamicResource SnipAccentBrush}" StrokeThickness="1"/>
-                <Line X1="0" Y1="72" X2="144" Y2="72"
-                      Stroke="{DynamicResource SnipAccentBrush}" StrokeThickness="1"/>
-                <Rectangle Width="4" Height="4"
-                           Fill="{DynamicResource SnipMintBrush}"
-                           HorizontalAlignment="Center" VerticalAlignment="Center"/>
-              </Grid>
-            </Border>
-            <TextBlock x:Name="LoupeText"
-                       Foreground="{DynamicResource SnipPrimaryTextBrush}"
-                       FontFamily="{DynamicResource SnipCodeFont}" FontSize="11"
-                       HorizontalAlignment="Center"/>
-          </StackPanel>
+          <Grid>
+            <StackPanel>
+              <Border Width="144" Height="144" Margin="12,12,12,5"
+                      BorderBrush="{DynamicResource SnipHairlineBrush}"
+                      BorderThickness="1" ClipToBounds="True">
+                <Grid>
+                  <Image x:Name="LoupeImage" Stretch="None"
+                         RenderOptions.BitmapScalingMode="NearestNeighbor"/>
+                  <Line X1="72" Y1="0" X2="72" Y2="144"
+                        Stroke="{DynamicResource SnipAccentBrush}" StrokeThickness="1"/>
+                  <Line X1="0" Y1="72" X2="144" Y2="72"
+                        Stroke="{DynamicResource SnipAccentBrush}" StrokeThickness="1"/>
+                  <Rectangle Width="4" Height="4"
+                             Fill="{DynamicResource SnipMintBrush}"
+                             HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                </Grid>
+              </Border>
+              <TextBlock x:Name="LoupeText"
+                         Foreground="{DynamicResource SnipPrimaryTextBrush}"
+                         FontFamily="{DynamicResource SnipCodeFont}" FontSize="11"
+                         HorizontalAlignment="Center"/>
+            </StackPanel>
+            <Border x:Name="LoupeInnerHighlight" Height="1" Margin="12,1,12,0"
+                    VerticalAlignment="Top" Background="{DynamicResource SnipInnerHighlightBrush}"/>
+          </Grid>
         </Border>
       </Border>
     </Canvas>
@@ -3064,10 +3087,14 @@ $script:SnipEmbeddedXaml = [ordered]@{
             BorderBrush="{DynamicResource SnipHairlineBrush}"
             BorderThickness="1" CornerRadius="16">
       <Border CornerRadius="15" Background="{DynamicResource SnipGlassGradientBrush}">
-        <TextBlock x:Name="HintText" Margin="2,0"
-                   Foreground="{DynamicResource SnipPrimaryTextBrush}"
-                   FontFamily="{DynamicResource SnipTextFont}" FontSize="12"
-                   Text="Click a window · Drag a region · Esc to cancel"/>
+        <Grid>
+          <TextBlock x:Name="HintText" Margin="2,0"
+                     Foreground="{DynamicResource SnipPrimaryTextBrush}"
+                     FontFamily="{DynamicResource SnipTextFont}" FontSize="12"
+                     Text="Click a window · Drag a region · Esc to cancel"/>
+          <Border x:Name="HintInnerHighlight" Height="1" Margin="10,0"
+                  VerticalAlignment="Top" Background="{DynamicResource SnipInnerHighlightBrush}"/>
+        </Grid>
       </Border>
     </Border>
   </Grid>
@@ -3086,12 +3113,12 @@ $script:SnipEmbeddedXaml = [ordered]@{
     <Border x:Name="GlassOuter" CornerRadius="16"
             Background="{DynamicResource SnipGlassScrimBrush}"
             Effect="{DynamicResource SnipIslandShadow}">
-      <Border x:Name="GlassSurface" CornerRadius="16"
+      <Border x:Name="GlassSurface" CornerRadius="15"
               Background="{DynamicResource SnipGlassGradientBrush}"
               BorderBrush="{DynamicResource SnipHairlineBrush}" BorderThickness="1">
         <Grid>
           <Border Height="1" Margin="16,1,16,0" VerticalAlignment="Top"
-                  Background="{DynamicResource SnipInnerHighlightBrush}" Opacity="0.55"/>
+                  Background="{DynamicResource SnipInnerHighlightBrush}"/>
           <Grid Margin="24,21,24,22">
             <Grid.RowDefinitions>
               <RowDefinition Height="Auto"/>
@@ -3126,6 +3153,8 @@ $script:SnipEmbeddedXaml = [ordered]@{
                          Foreground="{DynamicResource SnipSecondaryTextBrush}" Margin="0,3,0,9"/>
               <Button x:Name="ShortcutRecorder" Height="48" TabIndex="1"
                       HorizontalContentAlignment="Stretch" Style="{DynamicResource SnipButtonStyle}"
+                      Background="{DynamicResource SnipCanvasBrush}"
+                      BorderBrush="{DynamicResource SnipHairlineBrush}"
                       AutomationProperties.Name="Record Smart capture shortcut"
                       AutomationProperties.HelpText="Press one key with Control, Alt, or Shift modifiers"
                       ToolTip="Record the Smart capture shortcut">
@@ -3201,11 +3230,11 @@ $script:SnipEmbeddedXaml = [ordered]@{
     <Border x:Name="GlassOuter" CornerRadius="16"
             Background="{DynamicResource SnipGlassScrimBrush}"
             Effect="{DynamicResource SnipIslandShadow}">
-      <Border CornerRadius="16" Background="{DynamicResource SnipGlassGradientBrush}"
+      <Border x:Name="GlassSurface" CornerRadius="15" Background="{DynamicResource SnipGlassGradientBrush}"
               BorderBrush="{DynamicResource SnipHairlineBrush}" BorderThickness="1">
         <Grid>
           <Border Height="1" Margin="16,1,16,0" VerticalAlignment="Top"
-                  Background="{DynamicResource SnipInnerHighlightBrush}" Opacity="0.55"/>
+                  Background="{DynamicResource SnipInnerHighlightBrush}"/>
           <Grid Margin="24,21,24,22">
             <Grid.RowDefinitions><RowDefinition Height="Auto"/><RowDefinition Height="Auto"/>
               <RowDefinition Height="*"/><RowDefinition Height="Auto"/></Grid.RowDefinitions>
@@ -3269,13 +3298,13 @@ $script:SnipEmbeddedXaml = [ordered]@{
         UseLayoutRounding="True" SnapsToDevicePixels="True"
         AutomationProperties.Name="SnipIT capture widget">
   <Grid Margin="7">
-    <Border CornerRadius="16" Background="{DynamicResource SnipGlassScrimBrush}"
+    <Border x:Name="GlassOuter" CornerRadius="16" Background="{DynamicResource SnipGlassScrimBrush}"
             Effect="{DynamicResource SnipIslandShadow}">
-      <Border CornerRadius="16" Background="{DynamicResource SnipGlassGradientBrush}"
+      <Border x:Name="GlassSurface" CornerRadius="15" Background="{DynamicResource SnipGlassGradientBrush}"
               BorderBrush="{DynamicResource SnipHairlineBrush}" BorderThickness="1">
         <Grid>
-          <Border Height="1" Margin="14,1,14,0" VerticalAlignment="Top"
-                  Background="{DynamicResource SnipInnerHighlightBrush}" Opacity="0.55"/>
+          <Border x:Name="WidgetInnerHighlight" Height="1" Margin="14,1,14,0"
+                  VerticalAlignment="Top" Background="{DynamicResource SnipInnerHighlightBrush}"/>
           <UniformGrid Rows="1" Columns="4" Margin="7">
             <Button x:Name="SmartBtn" TabIndex="0" Margin="0,0,4,0"
                     Style="{DynamicResource SnipPrimaryButtonStyle}"
@@ -3825,6 +3854,7 @@ function New-SnipThemeResources {
         $resources['SnipSecondaryTextBrush'] = [System.Windows.SystemColors]::WindowTextBrush
         $resources['SnipMutedTextBrush'] = [System.Windows.SystemColors]::GrayTextBrush
         $resources['SnipHairlineBrush'] = [System.Windows.SystemColors]::WindowTextBrush
+        $resources['SnipQuietBorderBrush'] = [System.Windows.SystemColors]::WindowTextBrush
         $resources['SnipInnerHighlightBrush'] = [System.Windows.SystemColors]::WindowTextBrush
         $resources['SnipHoverBrush'] = [System.Windows.SystemColors]::ControlBrush
         $resources['SnipAccentBrush'] = [System.Windows.SystemColors]::HighlightBrush
@@ -3857,7 +3887,8 @@ function New-SnipThemeResources {
         $resources['SnipSecondaryTextBrush'] = & $newBrush $tokens.SecondaryText
         $resources['SnipMutedTextBrush'] = & $newBrush $tokens.MutedText
         $resources['SnipHairlineBrush'] = & $newBrush $tokens.Hairline
-        $resources['SnipInnerHighlightBrush'] = & $newBrush $tokens.Hairline
+        $resources['SnipQuietBorderBrush'] = [System.Windows.Media.Brushes]::Transparent
+        $resources['SnipInnerHighlightBrush'] = & $newBrush $tokens.InnerHighlight
         $resources['SnipHoverBrush'] = & $newBrush $tokens.HoverFill
         $resources['SnipAccentBrush'] = & $newBrush $tokens.Accent
         $accentTintColor = [System.Windows.Media.ColorConverter]::ConvertFromString($tokens.Accent)
@@ -3880,10 +3911,10 @@ function New-SnipThemeResources {
 
         $shadow = [System.Windows.Media.Effects.DropShadowEffect]::new()
         $shadow.Color = [System.Windows.Media.Colors]::Black
-        $shadow.BlurRadius = 18
-        $shadow.ShadowDepth = 5
+        $shadow.BlurRadius = 26
+        $shadow.ShadowDepth = 8
         $shadow.Direction = 270
-        $shadow.Opacity = 0.58
+        $shadow.Opacity = 0.68
         $shadow.Freeze()
         $resources['SnipIslandShadow'] = $shadow
         $resources['SnipGlassLayers'] = [string[]]@(
@@ -6053,9 +6084,8 @@ function New-SnipSplitControl {
     $root.BorderThickness = [System.Windows.Thickness]::new(1)
     $root.Margin = [System.Windows.Thickness]::new(2,0,2,0)
     $root.SetResourceReference(
-        [System.Windows.Controls.Border]::BorderBrushProperty, 'SnipHairlineBrush')
-    $root.SetResourceReference(
-        [System.Windows.Controls.Border]::BackgroundProperty, 'SnipGlassGradientBrush')
+        [System.Windows.Controls.Border]::BorderBrushProperty, 'SnipQuietBorderBrush')
+    $root.Background = [System.Windows.Media.Brushes]::Transparent
 
     $grid = [System.Windows.Controls.Grid]::new()
     $grid.ColumnDefinitions.Add([System.Windows.Controls.ColumnDefinition]::new())
@@ -6582,6 +6612,11 @@ function Set-SnipPreviewStatusPresentation {
     $mode = [string]$Context.ModeState.Value
     $statusText = $Context.Shell.StatusText
     $statusIsland = $Context.Shell.StatusIsland
+    if ($null -ne $Context.Shell.PSObject.Properties['StatusIndicator']) {
+        $Context.Shell.StatusIndicator.Visibility = if ($mode -eq 'Narrow') {
+            [System.Windows.Visibility]::Collapsed
+        } else { [System.Windows.Visibility]::Visible }
+    }
     if ($Context.StatusState.Kind -eq 'Idle') {
         $statusText.Text = if ($mode -eq 'Narrow') { '●' } else { 'Non-destructive edit' }
         $statusText.TextTrimming = [System.Windows.TextTrimming]::None
@@ -6692,7 +6727,7 @@ function Set-SnipPreviewResponsiveMode {
         }
         $Context.Shell.MoreButton.BorderBrush = if ($Context.MoreState.IsActive) {
             $Context.Resources['SnipAccentBrush']
-        } else { $Context.Resources['SnipHairlineBrush'] }
+        } else { $Context.Resources['SnipQuietBorderBrush'] }
         $Context.Shell.MoreButton.Background = if ($Context.MoreState.IsActive) {
             $Context.Resources['SnipAccentTintBrush']
         } else { [System.Windows.Media.Brushes]::Transparent }
@@ -6709,10 +6744,14 @@ function Set-SnipPreviewResponsiveMode {
 
     $Context.Shell.ToolDock.Margin = if ($mode -eq 'Narrow') {
         [System.Windows.Thickness]::new(0,0,0,96)
-    } else { [System.Windows.Thickness]::new(0,0,0,35) }
+    } else { [System.Windows.Thickness]::new(0,0,0,28) }
     $Context.Shell.PropertyIsland.Margin = if ($mode -eq 'Narrow') {
         [System.Windows.Thickness]::new(0,0,0,155)
-    } else { [System.Windows.Thickness]::new(0,0,0,94) }
+    } else { [System.Windows.Thickness]::new(0,0,0,90) }
+    $Context.Shell.ViewportIsland.Margin = if ($mode -eq 'Compact') {
+        [System.Windows.Thickness]::new(28,0,0,92)
+    } else { [System.Windows.Thickness]::new(28,0,0,28) }
+    $Context.Shell.StatusIsland.Margin = [System.Windows.Thickness]::new(0,0,28,28)
     $Context.Shell.CoordinateText.Visibility = if ($mode -eq 'Narrow') {
         [System.Windows.Visibility]::Collapsed
     } else { [System.Windows.Visibility]::Visible }
@@ -6913,6 +6952,13 @@ function New-SnipPreviewWindow {
         -PrimaryText '▒' -PrimaryAutomationName 'Blur tool, selected subtype Blur' `
         -OptionsAutomationName 'Blur or Pixelate options' -Options ([ordered]@{ Blur={}; Pixelate={} }) `
         -Context $Context -PrimaryWidth 38 -OptionsWidth 22
+    $toolGlyphFont = [System.Windows.Media.FontFamily]::new('Segoe UI Symbol')
+    foreach ($toolGlyphControl in @(
+        $select,$crop,$pen,$highlight,$text,$steps,$color,$undo,$redo,
+        $arrow.PrimaryButton,$rectangle.PrimaryButton,$privacy.PrimaryButton)) {
+        $toolGlyphControl.FontFamily = $toolGlyphFont
+        $toolGlyphControl.FontSize = 15
+    }
     $Context.SplitControls.Copy = $copy
     $Context.SplitControls.ArrowLine = $arrow
     $Context.SplitControls.RectangleEllipse = $rectangle
@@ -6925,7 +6971,7 @@ function New-SnipPreviewWindow {
     $select.Background = $Context.Resources['SnipAccentTintBrush']
     $select.BorderBrush = $Context.Resources['SnipAccentBrush']
     $moreMenu = [System.Windows.Controls.ContextMenu]::new()
-    $moreMenu.Background = $Context.Resources['SnipCanvasBrush']
+    $moreMenu.Background = $Context.Resources['SnipGlassScrimBrush']
     $moreMenu.Foreground = $Context.Resources['SnipPrimaryTextBrush']
     $moreMenu.BorderBrush = $Context.Resources['SnipHairlineBrush']
     $moreMenu.BorderThickness = [System.Windows.Thickness]::new(1)
@@ -7043,6 +7089,7 @@ function New-SnipPreviewWindow {
         ColorMenu=$colorMenu; ColorMenuItems=$colorMenuItems; ColorMenuControl=$colorMenuControl
         CoordinateText=$window.FindName('CoordinateText'); ZoomOutButton=$window.FindName('ZoomOutBtn')
         ZoomInButton=$window.FindName('ZoomInBtn'); StatusText=$window.FindName('StatusText')
+        StatusIndicator=$window.FindName('StatusIndicator')
     }
     $closeMenus = {
         foreach ($splitControl in @($Context.TransientMenus)) {
diff --git a/Test-SnipIT-Interactive.ps1 b/Test-SnipIT-Interactive.ps1
index 58bcdc9..2b349e7 100644
--- a/Test-SnipIT-Interactive.ps1
+++ b/Test-SnipIT-Interactive.ps1
@@ -1127,6 +1127,14 @@ Describe 'Per-monitor Smart overlay set' {
             $overlay.DragRect.Stroke, $fixture.Services.Resources['SnipMintBrush']))
         Should-BeTrue ($overlay.HintBorder.CornerRadius.TopLeft -gt 0)
         Should-BeTrue ($overlay.LoupeBorder.CornerRadius.TopLeft -gt 0)
+        Should-Be $overlay.LoupeBorder.Child.CornerRadius.TopLeft 15
+        Should-Be $overlay.HintBorder.Child.CornerRadius.TopLeft 15
+        foreach ($highlightName in 'LoupeInnerHighlight','HintInnerHighlight') {
+            $highlight = $overlay.Window.FindName($highlightName)
+            Should-BeTrue ($highlight -is [System.Windows.Controls.Border])
+            Should-Be $highlight.Height 1
+            Should-Be $highlight.Background $fixture.Services.Resources['SnipInnerHighlightBrush']
+        }
         $body = (Get-Command New-SnipOverlayWindow).ScriptBlock.ToString()
         Should-BeFalse ($body -match '(?i)#(?:00)?78D4|cyan')
     }
@@ -1881,9 +1889,71 @@ Describe 'Shared Optical Bench theme resources' {
         Should-Be $resources['SnipCornerHeight'] 42
         Should-Be $resources['SnipHairlineThickness'] 1
         Should-Be $resources['SnipAccentBrush'].Color.ToString() '#FFD8C8A5'
-        Should-Be $resources['SnipGlassScrimBrush'].Color.ToString() '#CC000000'
-        Should-Be $resources['SnipGlassGradientBrush'].GradientStops[0].Color.ToString() '#260E1012'
-        Should-Be $resources['SnipGlassGradientBrush'].GradientStops[1].Color.ToString() '#14050608'
+        Should-Be $resources['SnipGlassScrimBrush'].Color.ToString() '#E60A0C0E'
+        Should-Be $resources['SnipHairlineBrush'].Color.ToString() '#80D8C8A5'
+        Should-Be $resources['SnipQuietBorderBrush'].Color.ToString() '#00FFFFFF'
+        Should-Be $resources['SnipInnerHighlightBrush'].Color.ToString() '#33F3EAD7'
+        Should-BeFalse ($resources['SnipInnerHighlightBrush'].Color.ToString() -eq
+            $resources['SnipHairlineBrush'].Color.ToString())
+        Should-Be $resources['SnipGlassGradientBrush'].GradientStops[0].Color.ToString() '#4050463B'
+        Should-Be $resources['SnipGlassGradientBrush'].GradientStops[1].Color.ToString() '#26000000'
+    }
+
+    It 'keeps secondary buttons quiet at rest and reserves champagne chrome for primary actions' {
+        $resources = New-SnipThemeResources -HighContrast:$false -AnimationsEnabled:$false
+        $secondary = [System.Windows.Controls.Button]::new()
+        $primary = [System.Windows.Controls.Button]::new()
+        Add-SnipThemeResources -Root $secondary -Resources $resources | Out-Null
+        Add-SnipThemeResources -Root $primary -Resources $resources | Out-Null
+        $secondary.Style = $resources['SnipButtonStyle']
+        $primary.Style = $resources['SnipPrimaryButtonStyle']
+
+        Should-Be $secondary.Background.Color.ToString() '#00FFFFFF'
+        Should-Be $secondary.BorderBrush.Color.ToString() '#00FFFFFF'
+        Should-Be $secondary.BorderThickness.Left 1
+        Should-Be $primary.Background.Color.ToString() '#2ED8C8A5'
+        Should-Be $primary.BorderBrush.Color.ToString() '#FFD8C8A5'
+    }
+
+    It 'keeps quiet secondary and split boundaries visible in High Contrast' {
+        $resources = New-SnipThemeResources -HighContrast:$true -AnimationsEnabled:$false
+        Should-Be $resources['SnipQuietBorderBrush'].Color.ToString() `
+            ([System.Windows.SystemColors]::WindowTextColor.ToString())
+
+        $window = [System.Windows.Window]::new()
+        $window.ShowInTaskbar = $false
+        $window.WindowStartupLocation = 'Manual'
+        $window.Left = -10000
+        $window.Top = -10000
+        Add-SnipThemeResources -Root $window -Resources $resources | Out-Null
+        $button = [System.Windows.Controls.Button]::new()
+        $button.Style = $resources['SnipButtonStyle']
+        $context = [pscustomobject]@{
+            Resources = $resources
+            Window = $window
+            RegisterWindow = { param($hwnd) }
+            UnregisterWindow = { param($hwnd) }
+            GetKeyboardModifiers = { [System.Windows.Input.ModifierKeys]::None }
+            TransientMenus = [System.Collections.ArrayList]::new()
+        }
+        $split = New-SnipSplitControl -Name ReviewProbe -DefaultCommand Probe `
+            -PrimaryText 'Probe' -PrimaryAutomationName 'Probe action' `
+            -OptionsAutomationName 'Probe options' -Options ([ordered]@{ Probe = {} }) `
+            -Context $context -PrimaryWidth 56 -OptionsWidth 24
+        $panel = [System.Windows.Controls.StackPanel]::new()
+        $panel.Children.Add($button) | Out-Null
+        $panel.Children.Add($split.Root) | Out-Null
+        $window.Content = $panel
+        try {
+            $window.Show()
+            $window.UpdateLayout()
+            Should-Be $button.BorderBrush.Color.ToString() `
+                ([System.Windows.SystemColors]::WindowTextColor.ToString())
+            Should-Be $split.Root.BorderBrush.Color.ToString() `
+                ([System.Windows.SystemColors]::WindowTextColor.ToString())
+        } finally {
+            $window.Close()
+        }
     }
 
     It 'publishes the exact layered glass contract with restrained depth' {
@@ -1891,8 +1961,9 @@ Describe 'Shared Optical Bench theme resources' {
 
         Should-Be ($resources['SnipGlassLayers'] -join ',') 'ContrastScrim,GlassGradient,Hairline,InnerHighlight,Shadow'
         Should-BeTrue ($resources['SnipIslandShadow'] -is [System.Windows.Media.Effects.DropShadowEffect])
-        Should-Be $resources['SnipIslandShadow'].BlurRadius 18
-        Should-Be $resources['SnipIslandShadow'].ShadowDepth 5
+        Should-Be $resources['SnipIslandShadow'].BlurRadius 26
+        Should-Be $resources['SnipIslandShadow'].ShadowDepth 8
+        Should-Be $resources['SnipIslandShadow'].Opacity 0.68
         Should-Be $resources['SnipDisplayFont'].Source 'Segoe UI Variable Display'
         Should-Be $resources['SnipTextFont'].Source 'Segoe UI Variable Text'
         Should-Be $resources['SnipCodeFont'].Source 'Cascadia Code'
@@ -2124,6 +2195,10 @@ Describe 'Settings utility surface' {
             Should-Be $kit.ErrorText.Text ''
             Should-BeFalse ([string]::IsNullOrWhiteSpace([string]$kit.ShortcutRecorder.ToolTip))
             Should-BeFalse ([string]::IsNullOrWhiteSpace([string]$kit.Window.FindName('SaveBtn').ToolTip))
+            Should-Be $kit.Window.FindName('GlassOuter').CornerRadius.TopLeft 16
+            Should-Be $kit.Window.FindName('GlassSurface').CornerRadius.TopLeft 15
+            Should-Be $kit.ShortcutRecorder.BorderBrush $kit.Resources['SnipHairlineBrush']
+            Should-Be $kit.ShortcutRecorder.Background $kit.Resources['SnipCanvasBrush']
         }
 
         Should-Be $context.RegisteredHotkey.VirtualKey 0x52
@@ -2377,6 +2452,10 @@ Describe 'About utility surface' {
             Should-Be $kit.Metadata.ActiveShortcut 'Ctrl+Alt+Shift+Q'
             Should-Be $kit.Window.Title 'About SnipIT'
             Should-BeFalse ([string]::IsNullOrWhiteSpace([string]$kit.Window.FindName('CloseBtn').ToolTip))
+            Should-Be $kit.Window.FindName('GlassOuter').CornerRadius.TopLeft 16
+            Should-Be $kit.Window.FindName('GlassSurface').CornerRadius.TopLeft 15
+            Should-Be $kit.Window.FindName('HeaderCloseBtn').BorderBrush.Color.ToString() `
+                ([System.Windows.Media.Brushes]::Transparent.Color.ToString())
         }
     }
 }
@@ -2421,6 +2500,11 @@ Describe 'Optional floating capture widget' {
         Show-FloatingWidget -Context $context -TestAction {
             param($kit)
             Should-Be ($kit.Order -join ',') 'Smart,Full,Window,Settings'
+            Should-Be $kit.Window.FindName('GlassOuter').CornerRadius.TopLeft 16
+            Should-Be $kit.Window.FindName('GlassSurface').CornerRadius.TopLeft 15
+            $innerHighlight = $kit.Window.FindName('WidgetInnerHighlight')
+            Should-Be $innerHighlight.Height 1
+            Should-Be $innerHighlight.Background $kit.Resources['SnipInnerHighlightBrush']
             foreach ($button in $kit.Buttons.Values) {
                 Should-BeFalse ([string]::IsNullOrWhiteSpace([string]$button.ToolTip))
             }
@@ -2450,7 +2534,7 @@ Describe 'Owner-drawn tray presentation' {
             Should-BeTrue ($menu -is [System.Windows.Forms.ContextMenuStrip])
             Should-BeTrue ($menu.Renderer -is [System.Windows.Forms.ToolStripProfessionalRenderer])
             Should-Be $menu.Tag.Palette.PageBlack '#030405'
-            Should-Be $menu.Tag.Palette.PrimaryText '#F2F5F7'
+            Should-Be $menu.Tag.Palette.PrimaryText '#F5F1E8'
             Should-Be $menu.Tag.Palette.Accent '#D8C8A5'
             Should-Be ($menu.Tag.PrimaryOrder -join ',') 'Smart,Full,Window,Settings,About,Exit'
             Should-Be ($menu.Tag.Order -join ',') 'Smart,Full,Window,Separator1,Delay,Settings,Widget,OpenFolder,Separator2,About,Uninstall,Exit'
@@ -2982,7 +3066,7 @@ Describe 'Floating Studio copy completion contract' {
                     [System.Windows.RoutedEventArgs]::new(
                         [System.Windows.Controls.Primitives.ButtonBase]::ClickEvent))
                 $wasOpen.Value = $kit.Win.IsVisible
-                $wasOpen.Status = $kit.StatusIsland.Child.Children[1].Text
+                $wasOpen.Status = $kit.Win.FindName('StatusText').Text
             }.GetNewClosure()
         Should-Be $result 'UserCancelled'
         Should-BeTrue $wasOpen.Value
@@ -4106,11 +4190,63 @@ $null = Show-PreviewWindow -Bitmap $bmp -TestAction {
             Should-Be $kit.ActionsIsland.Height 42
             Should-Be $kit.ViewportIsland.Height 42
             Should-Be $kit.StatusIsland.Height 42
+            Should-Be $kit.BrandIsland.Width 292
+            Should-Be $kit.ViewportIsland.Width 216
             Should-Be $kit.ActionsIsland.CornerRadius.TopLeft 16
             Should-Be $kit.ViewportIsland.CornerRadius.TopLeft 16
             Should-Be $kit.StatusIsland.CornerRadius.TopLeft 16
             Should-Be $kit.PropertyIsland.Height 54
             Should-Be $kit.ToolDock.Height 51
+            foreach ($island in @(
+                $kit.BrandIsland,$kit.ActionsIsland,$kit.PropertyIsland,
+                $kit.ToolDock,$kit.ViewportIsland,$kit.StatusIsland)) {
+                $innerSurface = $island.Child.Children[0]
+                Should-Be $innerSurface.CornerRadius.TopLeft 15
+                Should-Be $innerSurface.CornerRadius.BottomRight 15
+            }
+        }
+
+        It 'uses consistent safe margins and keeps compact viewport controls above the dock' {
+            & $kit.SetResponsiveMode 1200 700
+            Should-Be $kit.BrandIsland.Margin.Left 28
+            Should-Be $kit.BrandIsland.Margin.Top 24
+            Should-Be $kit.ActionsIsland.Margin.Right 28
+            Should-Be $kit.ActionsIsland.Margin.Top 24
+            Should-Be $kit.ToolDock.Margin.Bottom 28
+            Should-Be $kit.PropertyIsland.Margin.Bottom 90
+            Should-Be $kit.ViewportIsland.Margin.Left 28
+            Should-Be $kit.ViewportIsland.Margin.Bottom 28
+            Should-Be $kit.StatusIsland.Margin.Right 28
+            Should-Be $kit.StatusIsland.Margin.Bottom 28
+
+            & $kit.SetResponsiveMode 900 600
+            Should-Be $kit.ViewportIsland.Margin.Bottom 92
+        }
+
+        It 'keeps inactive Preview controls and split containers borderless at rest' {
+            $transparent = [System.Windows.Media.Brushes]::Transparent.Color.ToString()
+            Should-Be $kit.Win.FindName('SaveBtn').BorderBrush.Color.ToString() $transparent
+            Should-Be $kit.Win.FindName('HighlightBtn').BorderBrush.Color.ToString() $transparent
+            Should-Be $kit.Context.Shell.MoreButton.BorderBrush.Color.ToString() $transparent
+            Should-Be $kit.SplitControls.ArrowLine.Root.BorderBrush.Color.ToString() $transparent
+            Should-Be $kit.SplitControls.ArrowLine.Root.Background.Color.ToString() $transparent
+            Should-Be $kit.Context.ToolControls.Select.BorderBrush `
+                $kit.Resources['SnipAccentBrush']
+        }
+
+        It 'uses a compact brand mark, restrained status indicator, and legible tool glyphs' {
+            $brandMark = $kit.Win.FindName('BrandMark')
+            $statusIndicator = $kit.Win.FindName('StatusIndicator')
+            Should-BeTrue ($brandMark -is [System.Windows.Controls.Border])
+            Should-Be $brandMark.Width 20
+            Should-Be $brandMark.CornerRadius.TopLeft 6
+            Should-Be $brandMark.BorderBrush $kit.Resources['SnipAccentBrush']
+            Should-BeTrue ($statusIndicator -is [System.Windows.Shapes.Ellipse])
+            Should-Be $statusIndicator.Fill $kit.Resources['SnipAccentBrush']
+            Should-Be $kit.Context.ToolControls.Select.FontSize 15
+            Should-Be $kit.Context.ToolControls.Select.FontFamily.Source 'Segoe UI Symbol'
+            Should-Be $kit.SplitControls.ArrowLine.PrimaryButton.FontSize 15
+            Should-Be $kit.SplitControls.ArrowLine.PrimaryButton.FontFamily.Source 'Segoe UI Symbol'
         }
 
         It 'orders the top actions correctly and keeps Copy and close primary' {
@@ -4361,6 +4497,9 @@ $null = Show-PreviewWindow -Bitmap $bmp -TestAction {
             & $kit.SetResponsiveMode 760 540
             & $kit.ClearStatus
             Should-Be $kit.StatusIsland.Width 42
+            Should-Be $kit.Context.Shell.StatusIndicator.Visibility `
+                ([System.Windows.Visibility]::Collapsed)
+            Should-Be $kit.Context.Shell.StatusText.Text '●'
             Should-Be $kit.Context.StatusState.Kind 'Idle'
             & $kit.SetStatus 'Saved to disk' 'Success'
             Should-BeTrue ($kit.StatusIsland.Width -ge 150)
@@ -4369,6 +4508,9 @@ $null = Show-PreviewWindow -Bitmap $bmp -TestAction {
             & $kit.ClearStatus
             Should-Be $kit.StatusIsland.Width 42
             Should-Be $kit.Context.StatusState.Kind 'Idle'
+            & $kit.SetResponsiveMode 1200 700
+            Should-Be $kit.Context.Shell.StatusIndicator.Visibility `
+                ([System.Windows.Visibility]::Visible)
         }
 
         It 'keeps actual Compact clipboard error and success status collision-safe and fully accessible' {
diff --git a/Test-SnipIT.ps1 b/Test-SnipIT.ps1
index 7833496..78d22f7 100644
--- a/Test-SnipIT.ps1
+++ b/Test-SnipIT.ps1
@@ -745,10 +745,11 @@ Describe 'Approved theme and settings contracts'
 It 'returns every locked black champagne token' {
     $tokens = Get-SnipThemeTokens
     $expected = [ordered]@{
-        PageBlack = '#030405'; CanvasBlack = '#090A0C'; GlassScrim = '#CC000000'
-        GlassTop = '#260E1012'; GlassBottom = '#14050608'
-        PrimaryText = '#F2F5F7'; SecondaryText = '#C0C5CA'; MutedText = '#9EA4AA'
-        Hairline = '#59FFFFFF'; HoverFill = '#1FFFFFFF'; Accent = '#D8C8A5'
+        PageBlack = '#030405'; CanvasBlack = '#080A0C'; GlassScrim = '#E60A0C0E'
+        GlassTop = '#4050463B'; GlassBottom = '#26000000'
+        PrimaryText = '#F5F1E8'; SecondaryText = '#C7C2B8'; MutedText = '#938E84'
+        Hairline = '#80D8C8A5'; InnerHighlight = '#33F3EAD7'
+        HoverFill = '#24D8C8A5'; Accent = '#D8C8A5'
         AccentText = '#F3EAD7'; Coral = '#FF8069'; Mint = '#A8EFD7'
         Amber = '#FFD36B'; Violet = '#BBA1FF'
         IslandRadius = 16; ControlRadius = 10; CornerIslandHeight = 42
@@ -760,8 +761,8 @@ It 'returns every locked black champagne token' {
 }
 It 'meets the locked worst-case contrast ratios' {
     $tokens = Get-SnipThemeTokens
-    ShouldBe (Get-SnipContrastRatio -Foreground $tokens.SecondaryText -Background '#2F2F30') 7.69
-    ShouldBe (Get-SnipContrastRatio -Foreground $tokens.Hairline -Background '#2F2F30') 3.01
+    ShouldBe (Get-SnipContrastRatio -Foreground $tokens.SecondaryText -Background '#2F2F30') 7.54
+    ShouldBe (Get-SnipContrastRatio -Foreground $tokens.Hairline -Background '#2F2F30') 3.22
 }
 It 'rejects malformed contrast colors' {
     ShouldThrowType -Body {
diff --git a/src/00-Core.ps1 b/src/00-Core.ps1
index 6b303df..0c1d76d 100644
--- a/src/00-Core.ps1
+++ b/src/00-Core.ps1
@@ -1250,10 +1250,11 @@ function Invoke-CaptureLoop {
 
 function Get-SnipThemeTokens {
     [pscustomobject][ordered]@{
-        PageBlack = '#030405'; CanvasBlack = '#090A0C'; GlassScrim = '#CC000000'
-        GlassTop = '#260E1012'; GlassBottom = '#14050608'
-        PrimaryText = '#F2F5F7'; SecondaryText = '#C0C5CA'; MutedText = '#9EA4AA'
-        Hairline = '#59FFFFFF'; HoverFill = '#1FFFFFFF'; Accent = '#D8C8A5'
+        PageBlack = '#030405'; CanvasBlack = '#080A0C'; GlassScrim = '#E60A0C0E'
+        GlassTop = '#4050463B'; GlassBottom = '#26000000'
+        PrimaryText = '#F5F1E8'; SecondaryText = '#C7C2B8'; MutedText = '#938E84'
+        Hairline = '#80D8C8A5'; InnerHighlight = '#33F3EAD7'
+        HoverFill = '#24D8C8A5'; Accent = '#D8C8A5'
         AccentText = '#F3EAD7'; Coral = '#FF8069'; Mint = '#A8EFD7'
         Amber = '#FFD36B'; Violet = '#BBA1FF'
         IslandRadius = 16; ControlRadius = 10; CornerIslandHeight = 42
diff --git a/src/10-Bootstrap.ps1 b/src/10-Bootstrap.ps1
index 634d730..48f8ee7 100644
--- a/src/10-Bootstrap.ps1
+++ b/src/10-Bootstrap.ps1
@@ -515,6 +515,7 @@ function New-SnipThemeResources {
         $resources['SnipSecondaryTextBrush'] = [System.Windows.SystemColors]::WindowTextBrush
         $resources['SnipMutedTextBrush'] = [System.Windows.SystemColors]::GrayTextBrush
         $resources['SnipHairlineBrush'] = [System.Windows.SystemColors]::WindowTextBrush
+        $resources['SnipQuietBorderBrush'] = [System.Windows.SystemColors]::WindowTextBrush
         $resources['SnipInnerHighlightBrush'] = [System.Windows.SystemColors]::WindowTextBrush
         $resources['SnipHoverBrush'] = [System.Windows.SystemColors]::ControlBrush
         $resources['SnipAccentBrush'] = [System.Windows.SystemColors]::HighlightBrush
@@ -547,7 +548,8 @@ function New-SnipThemeResources {
         $resources['SnipSecondaryTextBrush'] = & $newBrush $tokens.SecondaryText
         $resources['SnipMutedTextBrush'] = & $newBrush $tokens.MutedText
         $resources['SnipHairlineBrush'] = & $newBrush $tokens.Hairline
-        $resources['SnipInnerHighlightBrush'] = & $newBrush $tokens.Hairline
+        $resources['SnipQuietBorderBrush'] = [System.Windows.Media.Brushes]::Transparent
+        $resources['SnipInnerHighlightBrush'] = & $newBrush $tokens.InnerHighlight
         $resources['SnipHoverBrush'] = & $newBrush $tokens.HoverFill
         $resources['SnipAccentBrush'] = & $newBrush $tokens.Accent
         $accentTintColor = [System.Windows.Media.ColorConverter]::ConvertFromString($tokens.Accent)
@@ -570,10 +572,10 @@ function New-SnipThemeResources {
 
         $shadow = [System.Windows.Media.Effects.DropShadowEffect]::new()
         $shadow.Color = [System.Windows.Media.Colors]::Black
-        $shadow.BlurRadius = 18
-        $shadow.ShadowDepth = 5
+        $shadow.BlurRadius = 26
+        $shadow.ShadowDepth = 8
         $shadow.Direction = 270
-        $shadow.Opacity = 0.58
+        $shadow.Opacity = 0.68
         $shadow.Freeze()
         $resources['SnipIslandShadow'] = $shadow
         $resources['SnipGlassLayers'] = [string[]]@(
diff --git a/src/40-Preview.ps1 b/src/40-Preview.ps1
index be5d2b7..17ae7a3 100644
--- a/src/40-Preview.ps1
+++ b/src/40-Preview.ps1
@@ -592,9 +592,8 @@ function New-SnipSplitControl {
     $root.BorderThickness = [System.Windows.Thickness]::new(1)
     $root.Margin = [System.Windows.Thickness]::new(2,0,2,0)
     $root.SetResourceReference(
-        [System.Windows.Controls.Border]::BorderBrushProperty, 'SnipHairlineBrush')
-    $root.SetResourceReference(
-        [System.Windows.Controls.Border]::BackgroundProperty, 'SnipGlassGradientBrush')
+        [System.Windows.Controls.Border]::BorderBrushProperty, 'SnipQuietBorderBrush')
+    $root.Background = [System.Windows.Media.Brushes]::Transparent
 
     $grid = [System.Windows.Controls.Grid]::new()
     $grid.ColumnDefinitions.Add([System.Windows.Controls.ColumnDefinition]::new())
@@ -1121,6 +1120,11 @@ function Set-SnipPreviewStatusPresentation {
     $mode = [string]$Context.ModeState.Value
     $statusText = $Context.Shell.StatusText
     $statusIsland = $Context.Shell.StatusIsland
+    if ($null -ne $Context.Shell.PSObject.Properties['StatusIndicator']) {
+        $Context.Shell.StatusIndicator.Visibility = if ($mode -eq 'Narrow') {
+            [System.Windows.Visibility]::Collapsed
+        } else { [System.Windows.Visibility]::Visible }
+    }
     if ($Context.StatusState.Kind -eq 'Idle') {
         $statusText.Text = if ($mode -eq 'Narrow') { '●' } else { 'Non-destructive edit' }
         $statusText.TextTrimming = [System.Windows.TextTrimming]::None
@@ -1231,7 +1235,7 @@ function Set-SnipPreviewResponsiveMode {
         }
         $Context.Shell.MoreButton.BorderBrush = if ($Context.MoreState.IsActive) {
             $Context.Resources['SnipAccentBrush']
-        } else { $Context.Resources['SnipHairlineBrush'] }
+        } else { $Context.Resources['SnipQuietBorderBrush'] }
         $Context.Shell.MoreButton.Background = if ($Context.MoreState.IsActive) {
             $Context.Resources['SnipAccentTintBrush']
         } else { [System.Windows.Media.Brushes]::Transparent }
@@ -1248,10 +1252,14 @@ function Set-SnipPreviewResponsiveMode {
 
     $Context.Shell.ToolDock.Margin = if ($mode -eq 'Narrow') {
         [System.Windows.Thickness]::new(0,0,0,96)
-    } else { [System.Windows.Thickness]::new(0,0,0,35) }
+    } else { [System.Windows.Thickness]::new(0,0,0,28) }
     $Context.Shell.PropertyIsland.Margin = if ($mode -eq 'Narrow') {
         [System.Windows.Thickness]::new(0,0,0,155)
-    } else { [System.Windows.Thickness]::new(0,0,0,94) }
+    } else { [System.Windows.Thickness]::new(0,0,0,90) }
+    $Context.Shell.ViewportIsland.Margin = if ($mode -eq 'Compact') {
+        [System.Windows.Thickness]::new(28,0,0,92)
+    } else { [System.Windows.Thickness]::new(28,0,0,28) }
+    $Context.Shell.StatusIsland.Margin = [System.Windows.Thickness]::new(0,0,28,28)
     $Context.Shell.CoordinateText.Visibility = if ($mode -eq 'Narrow') {
         [System.Windows.Visibility]::Collapsed
     } else { [System.Windows.Visibility]::Visible }
@@ -1452,6 +1460,13 @@ function New-SnipPreviewWindow {
         -PrimaryText '▒' -PrimaryAutomationName 'Blur tool, selected subtype Blur' `
         -OptionsAutomationName 'Blur or Pixelate options' -Options ([ordered]@{ Blur={}; Pixelate={} }) `
         -Context $Context -PrimaryWidth 38 -OptionsWidth 22
+    $toolGlyphFont = [System.Windows.Media.FontFamily]::new('Segoe UI Symbol')
+    foreach ($toolGlyphControl in @(
+        $select,$crop,$pen,$highlight,$text,$steps,$color,$undo,$redo,
+        $arrow.PrimaryButton,$rectangle.PrimaryButton,$privacy.PrimaryButton)) {
+        $toolGlyphControl.FontFamily = $toolGlyphFont
+        $toolGlyphControl.FontSize = 15
+    }
     $Context.SplitControls.Copy = $copy
     $Context.SplitControls.ArrowLine = $arrow
     $Context.SplitControls.RectangleEllipse = $rectangle
@@ -1464,7 +1479,7 @@ function New-SnipPreviewWindow {
     $select.Background = $Context.Resources['SnipAccentTintBrush']
     $select.BorderBrush = $Context.Resources['SnipAccentBrush']
     $moreMenu = [System.Windows.Controls.ContextMenu]::new()
-    $moreMenu.Background = $Context.Resources['SnipCanvasBrush']
+    $moreMenu.Background = $Context.Resources['SnipGlassScrimBrush']
     $moreMenu.Foreground = $Context.Resources['SnipPrimaryTextBrush']
     $moreMenu.BorderBrush = $Context.Resources['SnipHairlineBrush']
     $moreMenu.BorderThickness = [System.Windows.Thickness]::new(1)
@@ -1582,6 +1597,7 @@ function New-SnipPreviewWindow {
         ColorMenu=$colorMenu; ColorMenuItems=$colorMenuItems; ColorMenuControl=$colorMenuControl
         CoordinateText=$window.FindName('CoordinateText'); ZoomOutButton=$window.FindName('ZoomOutBtn')
         ZoomInButton=$window.FindName('ZoomInBtn'); StatusText=$window.FindName('StatusText')
+        StatusIndicator=$window.FindName('StatusIndicator')
     }
     $closeMenus = {
         foreach ($splitControl in @($Context.TransientMenus)) {
diff --git a/xaml/AboutWindow.xaml b/xaml/AboutWindow.xaml
index 81a7b9e..c0d23b8 100644
--- a/xaml/AboutWindow.xaml
+++ b/xaml/AboutWindow.xaml
@@ -8,11 +8,11 @@
     <Border x:Name="GlassOuter" CornerRadius="16"
             Background="{DynamicResource SnipGlassScrimBrush}"
             Effect="{DynamicResource SnipIslandShadow}">
-      <Border CornerRadius="16" Background="{DynamicResource SnipGlassGradientBrush}"
+      <Border x:Name="GlassSurface" CornerRadius="15" Background="{DynamicResource SnipGlassGradientBrush}"
               BorderBrush="{DynamicResource SnipHairlineBrush}" BorderThickness="1">
         <Grid>
           <Border Height="1" Margin="16,1,16,0" VerticalAlignment="Top"
-                  Background="{DynamicResource SnipInnerHighlightBrush}" Opacity="0.55"/>
+                  Background="{DynamicResource SnipInnerHighlightBrush}"/>
           <Grid Margin="24,21,24,22">
             <Grid.RowDefinitions><RowDefinition Height="Auto"/><RowDefinition Height="Auto"/>
               <RowDefinition Height="*"/><RowDefinition Height="Auto"/></Grid.RowDefinitions>
diff --git a/xaml/FloatingWidget.xaml b/xaml/FloatingWidget.xaml
index ea9e021..d2f5125 100644
--- a/xaml/FloatingWidget.xaml
+++ b/xaml/FloatingWidget.xaml
@@ -6,13 +6,13 @@
         UseLayoutRounding="True" SnapsToDevicePixels="True"
         AutomationProperties.Name="SnipIT capture widget">
   <Grid Margin="7">
-    <Border CornerRadius="16" Background="{DynamicResource SnipGlassScrimBrush}"
+    <Border x:Name="GlassOuter" CornerRadius="16" Background="{DynamicResource SnipGlassScrimBrush}"
             Effect="{DynamicResource SnipIslandShadow}">
-      <Border CornerRadius="16" Background="{DynamicResource SnipGlassGradientBrush}"
+      <Border x:Name="GlassSurface" CornerRadius="15" Background="{DynamicResource SnipGlassGradientBrush}"
               BorderBrush="{DynamicResource SnipHairlineBrush}" BorderThickness="1">
         <Grid>
-          <Border Height="1" Margin="14,1,14,0" VerticalAlignment="Top"
-                  Background="{DynamicResource SnipInnerHighlightBrush}" Opacity="0.55"/>
+          <Border x:Name="WidgetInnerHighlight" Height="1" Margin="14,1,14,0"
+                  VerticalAlignment="Top" Background="{DynamicResource SnipInnerHighlightBrush}"/>
           <UniformGrid Rows="1" Columns="4" Margin="7">
             <Button x:Name="SmartBtn" TabIndex="0" Margin="0,0,4,0"
                     Style="{DynamicResource SnipPrimaryButtonStyle}"
diff --git a/xaml/PreviewWindow.xaml b/xaml/PreviewWindow.xaml
index b8420b4..594f274 100644
--- a/xaml/PreviewWindow.xaml
+++ b/xaml/PreviewWindow.xaml
@@ -22,7 +22,7 @@
       <Setter Property="Margin" Value="2,0"/>
       <Setter Property="Foreground" Value="{DynamicResource SnipPrimaryTextBrush}"/>
       <Setter Property="Background" Value="Transparent"/>
-      <Setter Property="BorderBrush" Value="{DynamicResource SnipHairlineBrush}"/>
+      <Setter Property="BorderBrush" Value="{DynamicResource SnipQuietBorderBrush}"/>
       <Setter Property="BorderThickness" Value="1"/><Setter Property="Cursor" Value="Hand"/>
       <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
       <Setter Property="Template"><Setter.Value><ControlTemplate TargetType="Button"><Grid>
@@ -33,14 +33,15 @@
         <Border x:Name="FocusRing" CornerRadius="10" BorderBrush="{DynamicResource SnipFocusBrush}"
                 BorderThickness="2" Visibility="Collapsed" IsHitTestVisible="False"/>
       </Grid><ControlTemplate.Triggers>
-        <Trigger Property="IsMouseOver" Value="True"><Setter TargetName="Surface" Property="Background" Value="{DynamicResource SnipHoverBrush}"/></Trigger>
+        <Trigger Property="IsMouseOver" Value="True"><Setter TargetName="Surface" Property="Background" Value="{DynamicResource SnipHoverBrush}"/><Setter TargetName="Surface" Property="BorderBrush" Value="{DynamicResource SnipHairlineBrush}"/></Trigger>
+        <Trigger Property="IsPressed" Value="True"><Setter TargetName="Surface" Property="Background" Value="{DynamicResource SnipAccentTintBrush}"/><Setter TargetName="Surface" Property="BorderBrush" Value="{DynamicResource SnipAccentBrush}"/></Trigger>
         <Trigger Property="IsKeyboardFocused" Value="True"><Setter TargetName="FocusRing" Property="Visibility" Value="Visible"/></Trigger>
       </ControlTemplate.Triggers></ControlTemplate></Setter.Value></Setter>
     </Style>
     <Style x:Key="StudioToolToggleStyle" TargetType="ToggleButton">
       <Setter Property="Width" Value="38"/><Setter Property="Height" Value="38"/>
       <Setter Property="Margin" Value="2,0"/><Setter Property="Foreground" Value="{DynamicResource SnipPrimaryTextBrush}"/>
-      <Setter Property="Background" Value="Transparent"/><Setter Property="BorderBrush" Value="{DynamicResource SnipHairlineBrush}"/>
+      <Setter Property="Background" Value="Transparent"/><Setter Property="BorderBrush" Value="{DynamicResource SnipQuietBorderBrush}"/>
       <Setter Property="BorderThickness" Value="1"/><Setter Property="Cursor" Value="Hand"/>
       <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
       <Setter Property="Template">
@@ -54,7 +55,7 @@
           <Border x:Name="FocusRing" CornerRadius="10" BorderBrush="{DynamicResource SnipFocusBrush}"
                   BorderThickness="2" Visibility="Collapsed" IsHitTestVisible="False"/>
         </Grid><ControlTemplate.Triggers>
-          <Trigger Property="IsMouseOver" Value="True"><Setter TargetName="Surface" Property="Background" Value="{DynamicResource SnipHoverBrush}"/></Trigger>
+          <Trigger Property="IsMouseOver" Value="True"><Setter TargetName="Surface" Property="Background" Value="{DynamicResource SnipHoverBrush}"/><Setter TargetName="Surface" Property="BorderBrush" Value="{DynamicResource SnipHairlineBrush}"/></Trigger>
           <Trigger Property="IsChecked" Value="True"><Setter TargetName="Surface" Property="Background" Value="{DynamicResource SnipAccentTintBrush}"/><Setter TargetName="Surface" Property="BorderBrush" Value="{DynamicResource SnipAccentBrush}"/><Setter TargetName="Indicator" Property="Visibility" Value="Visible"/></Trigger>
           <Trigger Property="IsKeyboardFocused" Value="True"><Setter TargetName="FocusRing" Property="Visibility" Value="Visible"/></Trigger>
         </ControlTemplate.Triggers></ControlTemplate></Setter.Value>
@@ -84,12 +85,19 @@
                 FocusVisualStyle="{StaticResource CanvasFocusVisualStyle}"/>
       </Grid>
     </ScrollViewer>
-    <Border x:Name="BrandIsland" Style="{StaticResource StudioIslandStyle}" Height="42" Width="250"
-            HorizontalAlignment="Left" VerticalAlignment="Top" Margin="30,24,0,0">
+    <Border x:Name="BrandIsland" Style="{StaticResource StudioIslandStyle}" Height="42" Width="292"
+            HorizontalAlignment="Left" VerticalAlignment="Top" Margin="28,24,0,0">
       <Grid x:Name="DragHeader" Background="Transparent">
         <Border CornerRadius="15" Background="{DynamicResource SnipGlassGradientBrush}"/>
         <StackPanel Orientation="Horizontal" VerticalAlignment="Center" Margin="13,0">
-          <TextBlock Text="SnipIT" FontWeight="SemiBold" Foreground="{DynamicResource SnipPrimaryTextBrush}"/>
+          <Border x:Name="BrandMark" Width="20" Height="20" CornerRadius="6"
+                  Margin="0,0,8,0" Background="{DynamicResource SnipAccentTintBrush}"
+                  BorderBrush="{DynamicResource SnipAccentBrush}" BorderThickness="1">
+            <TextBlock Text="+" FontSize="13" FontWeight="SemiBold"
+                       HorizontalAlignment="Center" VerticalAlignment="Center"
+                       Foreground="{DynamicResource SnipAccentTextBrush}"/>
+          </Border>
+          <TextBlock Text="SnipIT" FontSize="13" FontWeight="SemiBold" Foreground="{DynamicResource SnipPrimaryTextBrush}"/>
           <TextBlock Text="  ·  " Foreground="{DynamicResource SnipMutedTextBrush}"/>
           <TextBlock x:Name="DimText" FontFamily="{DynamicResource SnipCodeFont}" FontSize="11" Foreground="{DynamicResource SnipSecondaryTextBrush}"/>
           <TextBlock Text="  ·  " Foreground="{DynamicResource SnipMutedTextBrush}"/>
@@ -97,53 +105,58 @@
           <TextBlock Text="  ⠿" Foreground="{DynamicResource SnipMutedTextBrush}"/>
         </StackPanel>
         <Border x:Name="BrandInnerHighlight" Height="1" VerticalAlignment="Top"
-                Margin="2,0" Background="{DynamicResource SnipInnerHighlightBrush}"/>
+                Margin="12,1,12,0" Background="{DynamicResource SnipInnerHighlightBrush}"/>
       </Grid>
     </Border>
     <Border x:Name="ActionsIsland" Style="{StaticResource StudioIslandStyle}" Height="42"
-            HorizontalAlignment="Right" VerticalAlignment="Top" Margin="0,24,30,0" Padding="2">
+            HorizontalAlignment="Right" VerticalAlignment="Top" Margin="0,24,28,0" Padding="4,2">
       <Grid><Border CornerRadius="15" Background="{DynamicResource SnipGlassGradientBrush}"/>
         <StackPanel x:Name="ActionsPanel" Orientation="Horizontal" VerticalAlignment="Center"/>
         <Border x:Name="ActionsInnerHighlight" Height="1" VerticalAlignment="Top"
-                Margin="2,0" Background="{DynamicResource SnipInnerHighlightBrush}"/>
+                Margin="12,1,12,0" Background="{DynamicResource SnipInnerHighlightBrush}"/>
       </Grid>
     </Border>
     <Border x:Name="PropertyIsland" Style="{StaticResource StudioIslandStyle}" Height="54" Width="470"
-            HorizontalAlignment="Center" VerticalAlignment="Bottom" Margin="0,0,0,94" Padding="7">
+            HorizontalAlignment="Center" VerticalAlignment="Bottom" Margin="0,0,0,90" Padding="7">
       <Grid><Border CornerRadius="15" Background="{DynamicResource SnipGlassGradientBrush}"/>
         <StackPanel x:Name="PropertyPanel" Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center"/>
         <Border x:Name="PropertyInnerHighlight" Height="1" VerticalAlignment="Top"
-                Margin="2,0" Background="{DynamicResource SnipInnerHighlightBrush}"/>
+                Margin="12,1,12,0" Background="{DynamicResource SnipInnerHighlightBrush}"/>
       </Grid>
     </Border>
     <Border x:Name="ToolDock" Style="{StaticResource StudioIslandStyle}" Height="51"
-            HorizontalAlignment="Center" VerticalAlignment="Bottom" Margin="0,0,0,35" Padding="5">
+            HorizontalAlignment="Center" VerticalAlignment="Bottom" Margin="0,0,0,28" Padding="5">
       <Grid><Border CornerRadius="15" Background="{DynamicResource SnipGlassGradientBrush}"/>
         <StackPanel x:Name="ToolPanel" Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center"/>
         <Border x:Name="ToolDockInnerHighlight" Height="1" VerticalAlignment="Top"
-                Margin="2,0" Background="{DynamicResource SnipInnerHighlightBrush}"/>
+                Margin="12,1,12,0" Background="{DynamicResource SnipInnerHighlightBrush}"/>
       </Grid>
     </Border>
-    <Border x:Name="ViewportIsland" Style="{StaticResource StudioIslandStyle}" Height="42" Width="170"
-            HorizontalAlignment="Left" VerticalAlignment="Bottom" Margin="30,0,0,35" Padding="2">
+    <Border x:Name="ViewportIsland" Style="{StaticResource StudioIslandStyle}" Height="42" Width="216"
+            HorizontalAlignment="Left" VerticalAlignment="Bottom" Margin="28,0,0,28" Padding="3,2">
       <Grid><Border CornerRadius="15" Background="{DynamicResource SnipGlassGradientBrush}"/>
         <StackPanel x:Name="ViewportPanel" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center">
-          <TextBlock x:Name="CoordinateText" Text="x 0  y 0" FontFamily="{DynamicResource SnipCodeFont}" FontSize="10" Margin="3,0" Foreground="{DynamicResource SnipMutedTextBrush}"/>
+          <TextBlock x:Name="CoordinateText" Text="x 0  y 0" FontFamily="{DynamicResource SnipCodeFont}" FontSize="10" Margin="5,0" Foreground="{DynamicResource SnipMutedTextBrush}"/>
           <Button x:Name="ZoomOutBtn" Style="{StaticResource StudioToolButtonStyle}" Width="28" Height="32" AutomationProperties.Name="Zoom out" ToolTip="Zoom out (Ctrl+-)"><TextBlock Text="−"/></Button>
-          <TextBlock x:Name="ZoomText" Text="100%" Width="38" TextAlignment="Center" FontFamily="{DynamicResource SnipCodeFont}" FontSize="10" VerticalAlignment="Center" Foreground="{DynamicResource SnipPrimaryTextBrush}"/>
+          <TextBlock x:Name="ZoomText" Text="100%" Width="42" TextAlignment="Center" FontFamily="{DynamicResource SnipCodeFont}" FontSize="10" VerticalAlignment="Center" Foreground="{DynamicResource SnipPrimaryTextBrush}"/>
           <Button x:Name="ZoomInBtn" Style="{StaticResource StudioToolButtonStyle}" Width="28" Height="32" AutomationProperties.Name="Zoom in" ToolTip="Zoom in (Ctrl++)"><TextBlock Text="+"/></Button>
-          <Button x:Name="FitBtn" Style="{StaticResource StudioToolButtonStyle}" Width="32" Height="32" AutomationProperties.Name="Fit to viewport" ToolTip="Fit (Ctrl+0)"><TextBlock Text="Fit" FontSize="10"/></Button>
+          <Button x:Name="FitBtn" Style="{StaticResource StudioToolButtonStyle}" Width="36" Height="32" AutomationProperties.Name="Fit to viewport" ToolTip="Fit (Ctrl+0)"><TextBlock Text="Fit" FontSize="10"/></Button>
         </StackPanel>
         <Border x:Name="ViewportInnerHighlight" Height="1" VerticalAlignment="Top"
-                Margin="2,0" Background="{DynamicResource SnipInnerHighlightBrush}"/>
+                Margin="12,1,12,0" Background="{DynamicResource SnipInnerHighlightBrush}"/>
       </Grid>
     </Border>
     <Border x:Name="StatusIsland" Style="{StaticResource StudioIslandStyle}" Height="42" Width="150"
-            HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="0,0,30,35" Padding="10,0">
+            HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="0,0,28,28" Padding="10,0">
       <Grid><Border CornerRadius="15" Background="{DynamicResource SnipGlassGradientBrush}"/>
-        <TextBlock x:Name="StatusText" Text="Non-destructive edit" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="11" Foreground="{DynamicResource SnipSecondaryTextBrush}"/>
+        <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center">
+          <Ellipse x:Name="StatusIndicator" Width="5" Height="5" Margin="0,0,7,0"
+                   Fill="{DynamicResource SnipAccentBrush}"/>
+          <TextBlock x:Name="StatusText" Text="Non-destructive edit" FontSize="11"
+                     Foreground="{DynamicResource SnipSecondaryTextBrush}"/>
+        </StackPanel>
         <Border x:Name="StatusInnerHighlight" Height="1" VerticalAlignment="Top"
-                Margin="2,0" Background="{DynamicResource SnipInnerHighlightBrush}"/>
+                Margin="12,1,12,0" Background="{DynamicResource SnipInnerHighlightBrush}"/>
       </Grid>
     </Border>
     <Grid x:Name="HiddenLegacyControls" Visibility="Collapsed">
diff --git a/xaml/SettingsWindow.xaml b/xaml/SettingsWindow.xaml
index 04cb1f6..881c110 100644
--- a/xaml/SettingsWindow.xaml
+++ b/xaml/SettingsWindow.xaml
@@ -9,12 +9,12 @@
     <Border x:Name="GlassOuter" CornerRadius="16"
             Background="{DynamicResource SnipGlassScrimBrush}"
             Effect="{DynamicResource SnipIslandShadow}">
-      <Border x:Name="GlassSurface" CornerRadius="16"
+      <Border x:Name="GlassSurface" CornerRadius="15"
               Background="{DynamicResource SnipGlassGradientBrush}"
               BorderBrush="{DynamicResource SnipHairlineBrush}" BorderThickness="1">
         <Grid>
           <Border Height="1" Margin="16,1,16,0" VerticalAlignment="Top"
-                  Background="{DynamicResource SnipInnerHighlightBrush}" Opacity="0.55"/>
+                  Background="{DynamicResource SnipInnerHighlightBrush}"/>
           <Grid Margin="24,21,24,22">
             <Grid.RowDefinitions>
               <RowDefinition Height="Auto"/>
@@ -49,6 +49,8 @@
                          Foreground="{DynamicResource SnipSecondaryTextBrush}" Margin="0,3,0,9"/>
               <Button x:Name="ShortcutRecorder" Height="48" TabIndex="1"
                       HorizontalContentAlignment="Stretch" Style="{DynamicResource SnipButtonStyle}"
+                      Background="{DynamicResource SnipCanvasBrush}"
+                      BorderBrush="{DynamicResource SnipHairlineBrush}"
                       AutomationProperties.Name="Record Smart capture shortcut"
                       AutomationProperties.HelpText="Press one key with Control, Alt, or Shift modifiers"
                       ToolTip="Record the Smart capture shortcut">
diff --git a/xaml/SmartOverlay.xaml b/xaml/SmartOverlay.xaml
index dd6ac82..2e81fe2 100644
--- a/xaml/SmartOverlay.xaml
+++ b/xaml/SmartOverlay.xaml
@@ -21,27 +21,31 @@
               BorderThickness="1" CornerRadius="16" Visibility="Collapsed">
         <Border Margin="1" CornerRadius="15"
                 Background="{DynamicResource SnipGlassGradientBrush}">
-          <StackPanel>
-            <Border Width="144" Height="144" Margin="12,12,12,5"
-                    BorderBrush="{DynamicResource SnipHairlineBrush}"
-                    BorderThickness="1" ClipToBounds="True">
-              <Grid>
-                <Image x:Name="LoupeImage" Stretch="None"
-                       RenderOptions.BitmapScalingMode="NearestNeighbor"/>
-                <Line X1="72" Y1="0" X2="72" Y2="144"
-                      Stroke="{DynamicResource SnipAccentBrush}" StrokeThickness="1"/>
-                <Line X1="0" Y1="72" X2="144" Y2="72"
-                      Stroke="{DynamicResource SnipAccentBrush}" StrokeThickness="1"/>
-                <Rectangle Width="4" Height="4"
-                           Fill="{DynamicResource SnipMintBrush}"
-                           HorizontalAlignment="Center" VerticalAlignment="Center"/>
-              </Grid>
-            </Border>
-            <TextBlock x:Name="LoupeText"
-                       Foreground="{DynamicResource SnipPrimaryTextBrush}"
-                       FontFamily="{DynamicResource SnipCodeFont}" FontSize="11"
-                       HorizontalAlignment="Center"/>
-          </StackPanel>
+          <Grid>
+            <StackPanel>
+              <Border Width="144" Height="144" Margin="12,12,12,5"
+                      BorderBrush="{DynamicResource SnipHairlineBrush}"
+                      BorderThickness="1" ClipToBounds="True">
+                <Grid>
+                  <Image x:Name="LoupeImage" Stretch="None"
+                         RenderOptions.BitmapScalingMode="NearestNeighbor"/>
+                  <Line X1="72" Y1="0" X2="72" Y2="144"
+                        Stroke="{DynamicResource SnipAccentBrush}" StrokeThickness="1"/>
+                  <Line X1="0" Y1="72" X2="144" Y2="72"
+                        Stroke="{DynamicResource SnipAccentBrush}" StrokeThickness="1"/>
+                  <Rectangle Width="4" Height="4"
+                             Fill="{DynamicResource SnipMintBrush}"
+                             HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                </Grid>
+              </Border>
+              <TextBlock x:Name="LoupeText"
+                         Foreground="{DynamicResource SnipPrimaryTextBrush}"
+                         FontFamily="{DynamicResource SnipCodeFont}" FontSize="11"
+                         HorizontalAlignment="Center"/>
+            </StackPanel>
+            <Border x:Name="LoupeInnerHighlight" Height="1" Margin="12,1,12,0"
+                    VerticalAlignment="Top" Background="{DynamicResource SnipInnerHighlightBrush}"/>
+          </Grid>
         </Border>
       </Border>
     </Canvas>
@@ -51,10 +55,14 @@
             BorderBrush="{DynamicResource SnipHairlineBrush}"
             BorderThickness="1" CornerRadius="16">
       <Border CornerRadius="15" Background="{DynamicResource SnipGlassGradientBrush}">
-        <TextBlock x:Name="HintText" Margin="2,0"
-                   Foreground="{DynamicResource SnipPrimaryTextBrush}"
-                   FontFamily="{DynamicResource SnipTextFont}" FontSize="12"
-                   Text="Click a window · Drag a region · Esc to cancel"/>
+        <Grid>
+          <TextBlock x:Name="HintText" Margin="2,0"
+                     Foreground="{DynamicResource SnipPrimaryTextBrush}"
+                     FontFamily="{DynamicResource SnipTextFont}" FontSize="12"
+                     Text="Click a window · Drag a region · Esc to cancel"/>
+          <Border x:Name="HintInnerHighlight" Height="1" Margin="10,0"
+                  VerticalAlignment="Top" Background="{DynamicResource SnipInnerHighlightBrush}"/>
+        </Grid>
       </Border>
     </Border>
   </Grid>
diff --git a/xaml/ThemeResources.xaml b/xaml/ThemeResources.xaml
index 7031de5..c03bf70 100644
--- a/xaml/ThemeResources.xaml
+++ b/xaml/ThemeResources.xaml
@@ -3,7 +3,7 @@
   <Style x:Key="SnipButtonStyle" TargetType="{x:Type Button}">
     <Setter Property="Foreground" Value="{DynamicResource SnipPrimaryTextBrush}"/>
     <Setter Property="Background" Value="Transparent"/>
-    <Setter Property="BorderBrush" Value="{DynamicResource SnipHairlineBrush}"/>
+    <Setter Property="BorderBrush" Value="{DynamicResource SnipQuietBorderBrush}"/>
     <Setter Property="BorderThickness" Value="1"/>
     <Setter Property="FontFamily" Value="{DynamicResource SnipTextFont}"/>
     <Setter Property="FontSize" Value="12"/>
@@ -30,6 +30,11 @@
           <ControlTemplate.Triggers>
             <Trigger Property="IsMouseOver" Value="True">
               <Setter TargetName="Surface" Property="Background" Value="{DynamicResource SnipHoverBrush}"/>
+              <Setter TargetName="Surface" Property="BorderBrush" Value="{DynamicResource SnipHairlineBrush}"/>
+            </Trigger>
+            <Trigger Property="IsPressed" Value="True">
+              <Setter TargetName="Surface" Property="Background" Value="{DynamicResource SnipAccentTintBrush}"/>
+              <Setter TargetName="Surface" Property="BorderBrush" Value="{DynamicResource SnipAccentBrush}"/>
             </Trigger>
             <Trigger Property="IsKeyboardFocused" Value="True">
               <Setter TargetName="FocusRing" Property="Visibility" Value="Visible"/>
@@ -96,7 +101,7 @@
     </Setter>
   </Style>
   <Style x:Key="SnipContextMenuStyle" TargetType="{x:Type ContextMenu}">
-    <Setter Property="Background" Value="{DynamicResource SnipCanvasBrush}"/>
+    <Setter Property="Background" Value="{DynamicResource SnipGlassScrimBrush}"/>
     <Setter Property="Foreground" Value="{DynamicResource SnipPrimaryTextBrush}"/>
     <Setter Property="BorderBrush" Value="{DynamicResource SnipHairlineBrush}"/>
     <Setter Property="BorderThickness" Value="1"/>
@@ -121,7 +126,7 @@
   </Style>
   <Style x:Key="SnipMenuItemStyle" TargetType="{x:Type MenuItem}">
     <Setter Property="Foreground" Value="{DynamicResource SnipPrimaryTextBrush}"/>
-    <Setter Property="Background" Value="{DynamicResource SnipCanvasBrush}"/>
+    <Setter Property="Background" Value="Transparent"/>
     <Setter Property="BorderBrush" Value="Transparent"/>
     <Setter Property="BorderThickness" Value="1"/>
     <Setter Property="FontFamily" Value="{DynamicResource SnipTextFont}"/>
@@ -166,7 +171,7 @@
                    Focusable="False" PopupAnimation="{DynamicResource SnipPopupAnimation}"
                    IsOpen="{Binding IsSubmenuOpen, RelativeSource={RelativeSource TemplatedParent}}">
               <Border x:Name="SubmenuSurface" CornerRadius="10" Padding="2"
-                      Background="{DynamicResource SnipCanvasBrush}"
+                      Background="{DynamicResource SnipGlassScrimBrush}"
                       BorderBrush="{DynamicResource SnipHairlineBrush}"
                       BorderThickness="1">
                 <ScrollViewer CanContentScroll="True"

From 566251b2dba95cc5223ead1e5194616aaefa73cb Mon Sep 17 00:00:00 2001
From: Amit <ak.nitrr13@gmail.com>
Date: Tue, 14 Jul 2026 17:22:33 +0800
Subject: [PATCH 2/2] Stabilize WPF layout smoke measurement

---
 SnipIT.ps1                  | 35 ++++++++++++++++++++++++++---------
 Test-SnipIT-Interactive.ps1 | 16 +++++++++++++++-
 src/40-Preview.ps1          | 35 ++++++++++++++++++++++++++---------
 3 files changed, 67 insertions(+), 19 deletions(-)

diff --git a/SnipIT.ps1 b/SnipIT.ps1
index 94d1129..1e98886 100644
--- a/SnipIT.ps1
+++ b/SnipIT.ps1
@@ -8835,15 +8835,32 @@ function Show-PreviewWindow {
         & $setResponsiveMode $Width $Height
         $win.UpdateLayout()
         $root = $studioShell.StudioRoot
-        $result = @{}
-        foreach ($entry in ([ordered]@{
-            Brand=$studioShell.BrandIsland; Actions=$studioShell.ActionsIsland
-            Property=$studioShell.PropertyIsland; ToolDock=$studioShell.ToolDock
-            Viewport=$studioShell.ViewportIsland; Status=$studioShell.StatusIsland
-        }).GetEnumerator()) {
-            $origin = $entry.Value.TranslatePoint([System.Windows.Point]::new(0,0), $root)
-            $result[$entry.Key] = [System.Windows.Rect]::new(
-                $origin.X, $origin.Y, $entry.Value.ActualWidth, $entry.Value.ActualHeight)
+        $measurementHost = [System.Windows.Controls.Grid]::new()
+        $measurementHost.Width = $Width
+        $measurementHost.Height = $Height
+        $win.Content = $null
+        $win.UpdateLayout()
+        try {
+            $measurementHost.Children.Add($root) | Out-Null
+            $measurementHost.Measure([System.Windows.Size]::new($Width,$Height))
+            $measurementHost.Arrange([System.Windows.Rect]::new(0,0,$Width,$Height))
+            $measurementHost.UpdateLayout()
+            $result = @{}
+            foreach ($entry in ([ordered]@{
+                Brand=$studioShell.BrandIsland; Actions=$studioShell.ActionsIsland
+                Property=$studioShell.PropertyIsland; ToolDock=$studioShell.ToolDock
+                Viewport=$studioShell.ViewportIsland; Status=$studioShell.StatusIsland
+            }).GetEnumerator()) {
+                $origin = $entry.Value.TranslatePoint(
+                    [System.Windows.Point]::new(0,0), $root)
+                $result[$entry.Key] = [System.Windows.Rect]::new(
+                    $origin.X, $origin.Y, $entry.Value.ActualWidth,
+                    $entry.Value.ActualHeight)
+            }
+        } finally {
+            $measurementHost.Children.Remove($root)
+            $win.Content = $root
+            $win.UpdateLayout()
         }
         $result
     }.GetNewClosure()
diff --git a/Test-SnipIT-Interactive.ps1 b/Test-SnipIT-Interactive.ps1
index 2b349e7..032949b 100644
--- a/Test-SnipIT-Interactive.ps1
+++ b/Test-SnipIT-Interactive.ps1
@@ -4150,7 +4150,9 @@ $null = Show-PreviewWindow -Bitmap $bmp -TestAction {
                 $intersection = [System.Windows.Rect]::Intersect($left, $right)
                 if (-not $intersection.IsEmpty -and
                     $intersection.Width -gt 0 -and $intersection.Height -gt 0) {
-                    throw "Floating Studio islands overlap at ${Width}x${Height}: $($islandNames[$leftIndex]) and $($islandNames[$rightIndex])"
+                    throw ("Floating Studio islands overlap at ${Width}x${Height}: " +
+                        "$($islandNames[$leftIndex]) $left and " +
+                        "$($islandNames[$rightIndex]) $right")
                 }
             }
         }
@@ -4326,6 +4328,18 @@ $null = Show-PreviewWindow -Bitmap $bmp -TestAction {
             & $kit.SetPropertyIsland 'Select'
         }
 
+        It 'measures synthetic Wide layout independently of the host display width' {
+            $previousMaxWidth = $kit.Win.MaxWidth
+            try {
+                $kit.Win.MaxWidth = 1024
+                & $assertFloatingStudioLayout 1200 700 'Wide' @(
+                    'Select','Crop','Pen','Highlight','ArrowLine','RectangleEllipse',
+                    'Text','Steps','BlurPixelate','Color','Undo','Redo')
+            } finally {
+                $kit.Win.MaxWidth = $previousMaxWidth
+            }
+        }
+
         It 'selects Wide at 1200 by 700 without island overlap' {
             & $assertFloatingStudioLayout 1200 700 'Wide' @(
                 'Select','Crop','Pen','Highlight','ArrowLine','RectangleEllipse',
diff --git a/src/40-Preview.ps1 b/src/40-Preview.ps1
index 17ae7a3..62b4327 100644
--- a/src/40-Preview.ps1
+++ b/src/40-Preview.ps1
@@ -3343,15 +3343,32 @@ function Show-PreviewWindow {
         & $setResponsiveMode $Width $Height
         $win.UpdateLayout()
         $root = $studioShell.StudioRoot
-        $result = @{}
-        foreach ($entry in ([ordered]@{
-            Brand=$studioShell.BrandIsland; Actions=$studioShell.ActionsIsland
-            Property=$studioShell.PropertyIsland; ToolDock=$studioShell.ToolDock
-            Viewport=$studioShell.ViewportIsland; Status=$studioShell.StatusIsland
-        }).GetEnumerator()) {
-            $origin = $entry.Value.TranslatePoint([System.Windows.Point]::new(0,0), $root)
-            $result[$entry.Key] = [System.Windows.Rect]::new(
-                $origin.X, $origin.Y, $entry.Value.ActualWidth, $entry.Value.ActualHeight)
+        $measurementHost = [System.Windows.Controls.Grid]::new()
+        $measurementHost.Width = $Width
+        $measurementHost.Height = $Height
+        $win.Content = $null
+        $win.UpdateLayout()
+        try {
+            $measurementHost.Children.Add($root) | Out-Null
+            $measurementHost.Measure([System.Windows.Size]::new($Width,$Height))
+            $measurementHost.Arrange([System.Windows.Rect]::new(0,0,$Width,$Height))
+            $measurementHost.UpdateLayout()
+            $result = @{}
+            foreach ($entry in ([ordered]@{
+                Brand=$studioShell.BrandIsland; Actions=$studioShell.ActionsIsland
+                Property=$studioShell.PropertyIsland; ToolDock=$studioShell.ToolDock
+                Viewport=$studioShell.ViewportIsland; Status=$studioShell.StatusIsland
+            }).GetEnumerator()) {
+                $origin = $entry.Value.TranslatePoint(
+                    [System.Windows.Point]::new(0,0), $root)
+                $result[$entry.Key] = [System.Windows.Rect]::new(
+                    $origin.X, $origin.Y, $entry.Value.ActualWidth,
+                    $entry.Value.ActualHeight)
+            }
+        } finally {
+            $measurementHost.Children.Remove($root)
+            $win.Content = $root
+            $win.UpdateLayout()
         }
         $result
     }.GetNewClosure()