Tidy

Wallet.Avalonia/DropdownEntryView.axaml

@@ -7,9 +7,14 @@
     Header="{Binding Key}"
     IsExpanded="False">
     <SettingsExpander.Resources>
-        <Thickness x:Key="TextControlThemePadding">10,5,6,6</Thickness>
-        <Thickness x:Key="TextControlCompactThemePadding">0</Thickness>
+        <Thickness x:Key="TextControlMargin">0</Thickness>
+        <Thickness x:Key="TextControlPadding">10,5,6,6</Thickness>
+        <Thickness x:Key="TextControlCompactPadding">0</Thickness>
+        <Thickness x:Key="TextControlCompactMargin">0,-3,0,0</Thickness>
     </SettingsExpander.Resources>
+    <SettingsExpander.Action>
+        <ItemEntryActionView />
+    </SettingsExpander.Action>
     <SettingsExpander.Footer>
         <Grid>
             <ComboBox
@@ -21,7 +26,7 @@
                 <ComboBox.Styles>
                     <Style Selector="ComboBox.Write">
                         <Setter Property="MaxWidth" Value="{Binding Width}" />
-                        <Setter Property="MinWidth" Value="{Binding Width}" />                        
+                        <Setter Property="MinWidth" Value="{Binding Width}" />
                         <Setter Property="IsVisible" Value="True" />
                     </Style>
                     <Style Selector="ComboBox.Read">
@@ -48,7 +53,8 @@
                 <TextBox.Styles>
                     <Style Selector="TextBox.Write">
                         <Setter Property="IsVisible" Value="False" />
-                        <Setter Property="Padding" Value="{StaticResource TextControlThemePadding}" />
+                        <Setter Property="Margin" Value="{StaticResource TextControlMargin}" />
+                        <Setter Property="Padding" Value="{StaticResource TextControlPadding}" />
                     </Style>
                     <Style Selector="TextBox.Read">
                         <Setter Property="MinWidth" Value="0" />
@@ -56,7 +62,8 @@
                         <Setter Property="BorderBrush" Value="Transparent" />
                         <Setter Property="Background" Value="Transparent" />
                         <Setter Property="IsVisible" Value="True" />
-                        <Setter Property="Padding" Value="{StaticResource TextControlCompactThemePadding}" />
+                        <Setter Property="Margin" Value="{StaticResource TextControlCompactMargin}" />
+                        <Setter Property="Padding" Value="{StaticResource TextControlCompactPadding}" />
                         <Setter Property="MinHeight" Value="0" />
                         <Setter Property="Foreground">
                             <Setter.Value>

Wallet.Avalonia/HyperlinkEntryView.axaml

@@ -10,6 +10,9 @@
         <Thickness x:Key="TextControlThemePadding">10,5,6,6</Thickness>
         <Thickness x:Key="TextControlCompactThemePadding">0</Thickness>
     </SettingsExpander.Resources>
+    <SettingsExpander.Action>
+        <ItemEntryActionView />
+    </SettingsExpander.Action>
     <SettingsExpander.Footer>
         <Grid>
             <TextBox Text="{Binding Value}">

Wallet.Avalonia/MainView.axaml

@@ -31,7 +31,7 @@
                 <TextBlock
                     FontSize="10"
                     Foreground="{DynamicResource TextOnAccentFillColorPrimaryBrush}"
-                    Text="BETA PREVIEW 2" />
+                    Text="BETA PREVIEW 3" />
             </Border>
         </NavigationView.PaneHeader>
         <NavigationView.PaneCustomContent>

Wallet.Avalonia/MaskedTextEntryView.axaml

@@ -10,6 +10,9 @@
         <Thickness x:Key="TextControlThemePadding">10,5,6,6</Thickness>
         <Thickness x:Key="TextControlCompactThemePadding">0</Thickness>
     </SettingsExpander.Resources>
+    <SettingsExpander.Action>
+        <ItemEntryActionView />
+    </SettingsExpander.Action>
     <SettingsExpander.Footer>
         <MaskedTextBox Mask="{Binding Pattern}" Text="{Binding Value}">
             <TextBox.Styles>

Wallet.Avalonia/TextEntryView.axaml

@@ -7,8 +7,10 @@
     Header="{Binding Key}"
     IsExpanded="False">
     <SettingsExpander.Resources>
-        <Thickness x:Key="TextControlThemePadding">10,5,6,6</Thickness>
-        <Thickness x:Key="TextControlCompactThemePadding">0</Thickness>
+        <Thickness x:Key="TextControlMargin">0</Thickness>
+        <Thickness x:Key="TextControlPadding">10,5,6,6</Thickness>
+        <Thickness x:Key="TextControlCompactPadding">0</Thickness>
+        <Thickness x:Key="TextControlCompactMargin">0,-3,0,0</Thickness>
     </SettingsExpander.Resources>
     <SettingsExpander.Action>
         <ItemEntryActionView />
@@ -19,7 +21,8 @@
                 <Style Selector="TextBox.Write">
                     <Setter Property="MaxWidth" Value="{Binding Width}" />
                     <Setter Property="MinWidth" Value="{Binding Width}" />
-                    <Setter Property="Padding" Value="{StaticResource TextControlThemePadding}" />
+                    <Setter Property="Margin" Value="{StaticResource TextControlMargin}" />
+                    <Setter Property="Padding" Value="{StaticResource TextControlPadding}" />
                     <Setter Property="TextWrapping" Value="NoWrap" />
                 </Style>
                 <Style Selector="TextBox.Read">
@@ -27,7 +30,8 @@
                     <Setter Property="IsReadOnly" Value="True" />
                     <Setter Property="BorderBrush" Value="Transparent" />
                     <Setter Property="Background" Value="Transparent" />
-                    <Setter Property="Padding" Value="{StaticResource TextControlCompactThemePadding}" />
+                    <Setter Property="Margin" Value="{StaticResource TextControlCompactMargin}" />
+                    <Setter Property="Padding" Value="{StaticResource TextControlCompactPadding}" />                    
                     <Setter Property="MinHeight" Value="0" />
                     <Setter Property="TextWrapping" Value="Wrap" />
                     <Setter Property="Foreground">