diff --git a/Wallet.Avalonia/DateEntryView.axaml b/Wallet.Avalonia/DateEntryView.axaml
index 97c9157..8dbc44a 100644
--- a/Wallet.Avalonia/DateEntryView.axaml
+++ b/Wallet.Avalonia/DateEntryView.axaml
@@ -7,6 +7,7 @@
     Header="{Binding Key}"
     IsExpanded="False">
     <SettingsExpander.Resources>
+        <Thickness x:Key="TextControlMargin">0</Thickness>
         <Thickness x:Key="TextControlCompactPadding">0</Thickness>
         <Thickness x:Key="TextControlCompactMargin">0,-3,0,0</Thickness>
     </SettingsExpander.Resources>
@@ -24,6 +25,7 @@
                     </Style>
                     <Style Selector="DatePicker.Read">
                         <Setter Property="MinWidth" Value="0" />
+                        <Setter Property="MinHeight" Value="0" />
                         <Setter Property="IsVisible" Value="False" />
                     </Style>
                 </DatePicker.Styles>
diff --git a/Wallet.Avalonia/HyperlinkEntryView.axaml b/Wallet.Avalonia/HyperlinkEntryView.axaml
index 0cfe753..564b021 100644
--- a/Wallet.Avalonia/HyperlinkEntryView.axaml
+++ b/Wallet.Avalonia/HyperlinkEntryView.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 />
@@ -23,9 +25,14 @@
                         <Setter Property="IsVisible" Value="True" />
                     </Style>
                     <Style Selector="TextBox.Read">
-                        <Setter Property="MaxWidth" Value="{Binding Width}" />
-                        <Setter Property="MinWidth" Value="{Binding Width}" />
-                        <Setter Property="IsVisible" Value="False" />
+                        <Setter Property="MinWidth" Value="0" />
+                        <Setter Property="IsReadOnly" Value="True" />
+                        <Setter Property="BorderBrush" Value="Transparent" />
+                        <Setter Property="Background" Value="Transparent" />
+                        <Setter Property="IsVisible" Value="True" />
+                        <Setter Property="Margin" Value="{StaticResource TextControlCompactMargin}" />
+                        <Setter Property="Padding" Value="{StaticResource TextControlCompactPadding}" />
+                        <Setter Property="MinHeight" Value="0" />
                     </Style>
                 </TextBox.Styles>
                 <Interaction.Behaviors>
@@ -53,6 +60,7 @@
                     </Style>
                     <Style Selector="HyperlinkButton.Read">
                         <Setter Property="IsVisible" Value="True" />
+                        <Setter Property="Margin" Value="{StaticResource TextControlCompactMargin}" />
                     </Style>
                 </HyperlinkButton.Styles>
                 <Interaction.Behaviors>
diff --git a/Wallet.Avalonia/MaskedTextEntryView.axaml b/Wallet.Avalonia/MaskedTextEntryView.axaml
index 55893b6..10fc40e 100644
--- a/Wallet.Avalonia/MaskedTextEntryView.axaml
+++ b/Wallet.Avalonia/MaskedTextEntryView.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,9 +30,10 @@
                     <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="TextWrapping" Value="NoWrap" />
                     <Setter Property="Foreground">
                         <Setter.Value>
                             <SolidColorBrush Opacity="0.7" Color="{DynamicResource TextFillColorPrimary}" />
diff --git a/Wallet.Avalonia/PasswordEntryView.axaml b/Wallet.Avalonia/PasswordEntryView.axaml
index 9e76849..cd27253 100644
--- a/Wallet.Avalonia/PasswordEntryView.axaml
+++ b/Wallet.Avalonia/PasswordEntryView.axaml
@@ -5,7 +5,6 @@
     xmlns:v="using:Wallet.Avalonia"
     xmlns:vm="using:Wallet"
     x:DataType="vm:PasswordEntryViewModel"
-	
     Header="{Binding Key}"
     IsExpanded="False">
     <SettingsExpander.Resources>
@@ -40,7 +39,6 @@
                     <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">
                         <Setter.Value>
                             <SolidColorBrush Opacity="0.7" Color="{DynamicResource TextFillColorPrimary}" />
diff --git a/Wallet.Avalonia/TextEntryView.axaml b/Wallet.Avalonia/TextEntryView.axaml
index 53690e6..fcc8395 100644
--- a/Wallet.Avalonia/TextEntryView.axaml
+++ b/Wallet.Avalonia/TextEntryView.axaml
@@ -33,7 +33,7 @@
                     <Setter Property="Margin" Value="{StaticResource TextControlCompactMargin}" />
                     <Setter Property="Padding" Value="{StaticResource TextControlCompactPadding}" />                    
                     <Setter Property="MinHeight" Value="0" />
-                    <Setter Property="TextWrapping" Value="Wrap" />
+                    <Setter Property="TextWrapping" Value="NoWrap" />
                     <Setter Property="Foreground">
                         <Setter.Value>
                             <SolidColorBrush Opacity="0.7" Color="{DynamicResource TextFillColorPrimary}" />