diff --git a/Wallet.Avalonia/DateEntryView.axaml b/Wallet.Avalonia/DateEntryView.axaml
index 8dbc44a..572255d 100644
--- a/Wallet.Avalonia/DateEntryView.axaml
+++ b/Wallet.Avalonia/DateEntryView.axaml
@@ -10,6 +10,10 @@
         <Thickness x:Key="TextControlMargin">0</Thickness>
         <Thickness x:Key="TextControlCompactPadding">0</Thickness>
         <Thickness x:Key="TextControlCompactMargin">0,-3,0,0</Thickness>
+        <SolidColorBrush x:Key="DatePickerButtonBorderBrush" Color="Transparent" />
+        <SolidColorBrush x:Key="DatePickerButtonBorderBrushPointerOver" Color="Transparent" />
+        <Thickness x:Key="DatePickerHostPadding">0,5,0,6</Thickness>
+        <Thickness x:Key="DatePickerHostMonthPadding">9,5,0,6</Thickness>
     </SettingsExpander.Resources>
     <SettingsExpander.Action>
         <ItemEntryActionView />
@@ -22,6 +26,7 @@
                         <Setter Property="MaxWidth" Value="{Binding Width}" />
                         <Setter Property="MinWidth" Value="{Binding Width}" />
                         <Setter Property="IsVisible" Value="True" />
+                        <Setter Property="Height" Value="32" />
                     </Style>
                     <Style Selector="DatePicker.Read">
                         <Setter Property="MinWidth" Value="0" />
diff --git a/Wallet.Avalonia/DropdownEntryView.axaml b/Wallet.Avalonia/DropdownEntryView.axaml
index df09066..3bfd1f4 100644
--- a/Wallet.Avalonia/DropdownEntryView.axaml
+++ b/Wallet.Avalonia/DropdownEntryView.axaml
@@ -11,6 +11,8 @@
         <Thickness x:Key="TextControlPadding">10,5,6,6</Thickness>
         <Thickness x:Key="TextControlCompactPadding">0</Thickness>
         <Thickness x:Key="TextControlCompactMargin">0,-3,0,0</Thickness>
+        <SolidColorBrush x:Key="ComboBoxBorderBrush" Color="Transparent" />
+        <SolidColorBrush x:Key="ComboBoxBorderBrushPointerOver" Color="Transparent" />
     </SettingsExpander.Resources>
     <SettingsExpander.Action>
         <ItemEntryActionView />
diff --git a/Wallet.Avalonia/HyperlinkEntryView.axaml b/Wallet.Avalonia/HyperlinkEntryView.axaml
index 564b021..3c6c402 100644
--- a/Wallet.Avalonia/HyperlinkEntryView.axaml
+++ b/Wallet.Avalonia/HyperlinkEntryView.axaml
@@ -11,6 +11,8 @@
         <Thickness x:Key="TextControlPadding">10,5,6,6</Thickness>
         <Thickness x:Key="TextControlCompactPadding">0</Thickness>
         <Thickness x:Key="TextControlCompactMargin">0,-3,0,0</Thickness>
+		<SolidColorBrush x:Key="TextControlBorderBrush" Color="Transparent" />
+		<SolidColorBrush x:Key="TextControlBorderBrushPointerOver" Color="Transparent" />
     </SettingsExpander.Resources>
     <SettingsExpander.Action>
         <ItemEntryActionView />
diff --git a/Wallet.Avalonia/ItemHeaderView.axaml b/Wallet.Avalonia/ItemHeaderView.axaml
index 3c3ec82..e1db23e 100644
--- a/Wallet.Avalonia/ItemHeaderView.axaml
+++ b/Wallet.Avalonia/ItemHeaderView.axaml
@@ -13,6 +13,8 @@
         <x:Double x:Key="TextBoxMinWidth">264</x:Double>
         <Thickness x:Key="ButtonMargin">0,0,6,6</Thickness>
         <CornerRadius x:Key="ButtonCornerRadius">18</CornerRadius>
+        <SolidColorBrush x:Key="TextControlBorderBrush" Color="Transparent" />
+        <SolidColorBrush x:Key="TextControlBorderBrushPointerOver" Color="Transparent" />
     </UserControl.Resources>
     <StackPanel Grid.Column="1" Spacing="12">
         <Grid HorizontalAlignment="Center">
diff --git a/Wallet.Avalonia/MaskedTextEntryView.axaml b/Wallet.Avalonia/MaskedTextEntryView.axaml
index 10fc40e..22dd353 100644
--- a/Wallet.Avalonia/MaskedTextEntryView.axaml
+++ b/Wallet.Avalonia/MaskedTextEntryView.axaml
@@ -11,6 +11,8 @@
         <Thickness x:Key="TextControlPadding">10,5,6,6</Thickness>
         <Thickness x:Key="TextControlCompactPadding">0</Thickness>
         <Thickness x:Key="TextControlCompactMargin">0,-3,0,0</Thickness>
+		<SolidColorBrush x:Key="TextControlBorderBrush" Color="Transparent" />
+		<SolidColorBrush x:Key="TextControlBorderBrushPointerOver" Color="Transparent" />
     </SettingsExpander.Resources>
     <SettingsExpander.Action>
         <ItemEntryActionView />
diff --git a/Wallet.Avalonia/MultilineTextEntryView.axaml b/Wallet.Avalonia/MultilineTextEntryView.axaml
index 2095914..25b029a 100644
--- a/Wallet.Avalonia/MultilineTextEntryView.axaml
+++ b/Wallet.Avalonia/MultilineTextEntryView.axaml
@@ -7,15 +7,18 @@
     Header="{Binding Key}"
     IsExpanded="True"
     IsToggleable="True">
-    <TextBox Text="{Binding Value}" TextWrapping="Wrap">
+    <TextBox
+        Text="{Binding Value}"
+        TextWrapping="Wrap"
+        Watermark="Add a note">
         <TextBox.Styles>
             <Style Selector="TextBox.Write">
-                <Setter Property="Height" Value="216" />
+                <Setter Property="MaxHeight" Value="216" />
                 <Setter Property="AcceptsTab" Value="True" />
                 <Setter Property="AcceptsReturn" Value="True" />
+                <Setter Property="BorderBrush" Value="Transparent" />
             </Style>
             <Style Selector="TextBox.Read">
-                <Setter Property="Height" Value="216" />
                 <Setter Property="IsReadOnly" Value="True" />
                 <Setter Property="BorderBrush" Value="Transparent" />
                 <Setter Property="Background" Value="Transparent" />
diff --git a/Wallet.Avalonia/PasswordEntryView.axaml b/Wallet.Avalonia/PasswordEntryView.axaml
index cd27253..0736c07 100644
--- a/Wallet.Avalonia/PasswordEntryView.axaml
+++ b/Wallet.Avalonia/PasswordEntryView.axaml
@@ -13,6 +13,8 @@
         <Thickness x:Key="TextControlCompactPadding">0</Thickness>
         <Thickness x:Key="TextControlCompactMargin">0,-3,0,0</Thickness>
         <BooleanToPasswordCharConverter x:Key="BooleanToPasswordCharConverter" PasswordChar="&#x25CF;" />
+		<SolidColorBrush x:Key="TextControlBorderBrush" Color="Transparent" />
+		<SolidColorBrush x:Key="TextControlBorderBrushPointerOver" Color="Transparent" />
     </SettingsExpander.Resources>
     <SettingsExpander.Action>
         <ItemEntryActionView />
diff --git a/Wallet.Avalonia/TextEntryView.axaml b/Wallet.Avalonia/TextEntryView.axaml
index fcc8395..3f79e7f 100644
--- a/Wallet.Avalonia/TextEntryView.axaml
+++ b/Wallet.Avalonia/TextEntryView.axaml
@@ -11,6 +11,8 @@
         <Thickness x:Key="TextControlPadding">10,5,6,6</Thickness>
         <Thickness x:Key="TextControlCompactPadding">0</Thickness>
         <Thickness x:Key="TextControlCompactMargin">0,-3,0,0</Thickness>
+        <SolidColorBrush x:Key="TextControlBorderBrush" Color="Transparent" />
+        <SolidColorBrush x:Key="TextControlBorderBrushPointerOver" Color="Transparent" />
     </SettingsExpander.Resources>
     <SettingsExpander.Action>
         <ItemEntryActionView />
@@ -31,7 +33,7 @@
                     <Setter Property="BorderBrush" Value="Transparent" />
                     <Setter Property="Background" Value="Transparent" />
                     <Setter Property="Margin" Value="{StaticResource TextControlCompactMargin}" />
-                    <Setter Property="Padding" Value="{StaticResource TextControlCompactPadding}" />                    
+                    <Setter Property="Padding" Value="{StaticResource TextControlCompactPadding}" />
                     <Setter Property="MinHeight" Value="0" />
                     <Setter Property="TextWrapping" Value="NoWrap" />
                     <Setter Property="Foreground">