diff --git a/Wallet.Avalonia/DateEntryView.axaml b/Wallet.Avalonia/DateEntryView.axaml
index 64de48f..910d677 100644
--- a/Wallet.Avalonia/DateEntryView.axaml
+++ b/Wallet.Avalonia/DateEntryView.axaml
@@ -4,12 +4,18 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:vm="using:Wallet"
     x:DataType="vm:DateEntryViewModel"
-    Header="{Binding Key}">
+    Header="{Binding Key}"
+    IsExpanded="False">
+    <SettingsExpander.Resources>
+        <Thickness x:Key="TextControlThemePadding">10,5,6,6</Thickness>
+        <Thickness x:Key="TextControlCompactThemePadding">0</Thickness>
+    </SettingsExpander.Resources>
     <SettingsExpander.Footer>
         <Grid>
             <DatePicker SelectedDate="{Binding Value}">
                 <DatePicker.Styles>
                     <Style Selector="DatePicker.Write">
+                        <Setter Property="MaxWidth" Value="{Binding Width}" />
                         <Setter Property="MinWidth" Value="{Binding Width}" />
                         <Setter Property="IsVisible" Value="True" />
                     </Style>
@@ -44,7 +50,9 @@
                         <Setter Property="BorderBrush" Value="Transparent" />
                         <Setter Property="Background" Value="Transparent" />
                         <Setter Property="IsVisible" Value="True" />
-                        <Setter Property="Foreground">
+                        <Setter Property="Padding" Value="{StaticResource TextControlCompactThemePadding}" />
+                        <Setter Property="MinHeight" Value="0" />
+						<Setter Property="Foreground">
                             <Setter.Value>
                                 <SolidColorBrush Opacity="0.7" Color="{DynamicResource TextFillColorPrimary}" />
                             </Setter.Value>
diff --git a/Wallet.Avalonia/DropdownEntryView.axaml b/Wallet.Avalonia/DropdownEntryView.axaml
index 8ea3ef5..452c1bf 100644
--- a/Wallet.Avalonia/DropdownEntryView.axaml
+++ b/Wallet.Avalonia/DropdownEntryView.axaml
@@ -4,7 +4,12 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:vm="using:Wallet"
     x:DataType="vm:DropdownEntryViewModel"
-    Header="{Binding Key}">
+    Header="{Binding Key}"
+    IsExpanded="False">
+    <SettingsExpander.Resources>
+        <Thickness x:Key="TextControlThemePadding">10,5,6,6</Thickness>
+        <Thickness x:Key="TextControlCompactThemePadding">0</Thickness>
+    </SettingsExpander.Resources>
     <SettingsExpander.Footer>
         <Grid>
             <ComboBox
@@ -15,7 +20,8 @@
                 SelectedValueBinding="{ReflectionBinding Value}">
                 <ComboBox.Styles>
                     <Style Selector="ComboBox.Write">
-                        <Setter Property="MinWidth" Value="{Binding Width}" />
+                        <Setter Property="MaxWidth" Value="{Binding Width}" />
+                        <Setter Property="MinWidth" Value="{Binding Width}" />                        
                         <Setter Property="IsVisible" Value="True" />
                     </Style>
                     <Style Selector="ComboBox.Read">
@@ -42,6 +48,7 @@
                 <TextBox.Styles>
                     <Style Selector="TextBox.Write">
                         <Setter Property="IsVisible" Value="False" />
+                        <Setter Property="Padding" Value="{StaticResource TextControlThemePadding}" />
                     </Style>
                     <Style Selector="TextBox.Read">
                         <Setter Property="MinWidth" Value="0" />
@@ -49,6 +56,8 @@
                         <Setter Property="BorderBrush" Value="Transparent" />
                         <Setter Property="Background" Value="Transparent" />
                         <Setter Property="IsVisible" Value="True" />
+                        <Setter Property="Padding" Value="{StaticResource TextControlCompactThemePadding}" />
+                        <Setter Property="MinHeight" Value="0" />
                         <Setter Property="Foreground">
                             <Setter.Value>
                                 <SolidColorBrush Opacity="0.7" Color="{DynamicResource TextFillColorPrimary}" />
diff --git a/Wallet.Avalonia/HyperlinkEntryView.axaml b/Wallet.Avalonia/HyperlinkEntryView.axaml
index 3dc6668..fb171fd 100644
--- a/Wallet.Avalonia/HyperlinkEntryView.axaml
+++ b/Wallet.Avalonia/HyperlinkEntryView.axaml
@@ -4,16 +4,23 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:vm="using:Wallet"
     x:DataType="vm:HyperlinkEntryViewModel"
-    Header="{Binding Key}">
+    Header="{Binding Key}"
+    IsExpanded="False">
+    <SettingsExpander.Resources>
+        <Thickness x:Key="TextControlThemePadding">10,5,6,6</Thickness>
+        <Thickness x:Key="TextControlCompactThemePadding">0</Thickness>
+    </SettingsExpander.Resources>
     <SettingsExpander.Footer>
         <Grid>
             <TextBox Text="{Binding Value}">
                 <TextBox.Styles>
                     <Style Selector="TextBox.Write">
+                        <Setter Property="MaxWidth" Value="{Binding Width}" />
                         <Setter Property="MinWidth" Value="{Binding Width}" />
                         <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" />
                     </Style>
diff --git a/Wallet.Avalonia/MaskedTextEntryView.axaml b/Wallet.Avalonia/MaskedTextEntryView.axaml
index 8ad69ff..5612d25 100644
--- a/Wallet.Avalonia/MaskedTextEntryView.axaml
+++ b/Wallet.Avalonia/MaskedTextEntryView.axaml
@@ -4,18 +4,29 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:vm="using:Wallet"
     x:DataType="vm:MaskedTextEntryViewModel"
-    Header="{Binding Key}">
+    Header="{Binding Key}"
+    IsExpanded="False">
+    <SettingsExpander.Resources>
+        <Thickness x:Key="TextControlThemePadding">10,5,6,6</Thickness>
+        <Thickness x:Key="TextControlCompactThemePadding">0</Thickness>
+    </SettingsExpander.Resources>
     <SettingsExpander.Footer>
         <MaskedTextBox Mask="{Binding Pattern}" Text="{Binding Value}">
             <TextBox.Styles>
                 <Style Selector="TextBox.Write">
+                    <Setter Property="MaxWidth" Value="{Binding Width}" />
                     <Setter Property="MinWidth" Value="{Binding Width}" />
+                    <Setter Property="Padding" Value="{StaticResource TextControlThemePadding}" />
+                    <Setter Property="TextWrapping" Value="NoWrap" />
                 </Style>
                 <Style Selector="TextBox.Read">
                     <Setter Property="MinWidth" Value="0" />
                     <Setter Property="IsReadOnly" Value="True" />
                     <Setter Property="BorderBrush" Value="Transparent" />
                     <Setter Property="Background" Value="Transparent" />
+                    <Setter Property="Padding" Value="{StaticResource TextControlCompactThemePadding}" />
+                    <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/PasswordEntryView.axaml b/Wallet.Avalonia/PasswordEntryView.axaml
index 70a6a1b..23c0527 100644
--- a/Wallet.Avalonia/PasswordEntryView.axaml
+++ b/Wallet.Avalonia/PasswordEntryView.axaml
@@ -4,7 +4,12 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:vm="using:Wallet"
     x:DataType="vm:PasswordEntryViewModel"
-    Header="{Binding Key}">
+    Header="{Binding Key}"
+    IsExpanded="False">
+    <SettingsExpander.Resources>
+        <Thickness x:Key="TextControlThemePadding">10,5,6,6</Thickness>
+        <Thickness x:Key="TextControlCompactThemePadding">0</Thickness>
+    </SettingsExpander.Resources>
     <SettingsExpander.Footer>
         <TextBox
             Classes="revealPasswordButton"
@@ -12,13 +17,19 @@
             Text="{Binding Value}">
             <TextBox.Styles>
                 <Style Selector="TextBox.Write">
+                    <Setter Property="MaxWidth" Value="{Binding Width}" />
                     <Setter Property="MinWidth" Value="{Binding Width}" />
+                    <Setter Property="Padding" Value="{StaticResource TextControlThemePadding}" />
+                    <Setter Property="TextWrapping" Value="NoWrap" />
                 </Style>
                 <Style Selector="TextBox.Read">
                     <Setter Property="MinWidth" Value="0" />
                     <Setter Property="IsReadOnly" Value="True" />
                     <Setter Property="BorderBrush" Value="Transparent" />
                     <Setter Property="Background" Value="Transparent" />
+                    <Setter Property="Padding" Value="{StaticResource TextControlCompactThemePadding}" />
+                    <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 284022a..ccde4c5 100644
--- a/Wallet.Avalonia/TextEntryView.axaml
+++ b/Wallet.Avalonia/TextEntryView.axaml
@@ -4,18 +4,29 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:vm="using:Wallet"
     x:DataType="vm:TextEntryViewModel"
-    Header="{Binding Key}">
+    Header="{Binding Key}"
+    IsExpanded="False">
+    <SettingsExpander.Resources>
+        <Thickness x:Key="TextControlThemePadding">10,5,6,6</Thickness>
+        <Thickness x:Key="TextControlCompactThemePadding">0</Thickness>
+    </SettingsExpander.Resources>
     <SettingsExpander.Footer>
         <TextBox Text="{Binding Value}">
             <TextBox.Styles>
                 <Style Selector="TextBox.Write">
+                    <Setter Property="MaxWidth" Value="{Binding Width}" />
                     <Setter Property="MinWidth" Value="{Binding Width}" />
+                    <Setter Property="Padding" Value="{StaticResource TextControlThemePadding}" />
+                    <Setter Property="TextWrapping" Value="NoWrap" />
                 </Style>
                 <Style Selector="TextBox.Read">
                     <Setter Property="MinWidth" Value="0" />
                     <Setter Property="IsReadOnly" Value="True" />
                     <Setter Property="BorderBrush" Value="Transparent" />
                     <Setter Property="Background" Value="Transparent" />
+                    <Setter Property="Padding" Value="{StaticResource TextControlCompactThemePadding}" />
+                    <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/ItemConfiguration.cs b/Wallet/ItemConfiguration.cs
index 422099b..8a1d226 100644
--- a/Wallet/ItemConfiguration.cs
+++ b/Wallet/ItemConfiguration.cs
@@ -762,8 +762,7 @@ public record ItemConfiguration
                     new DropdownEntryConfiguration
                     {
                         Label = "Type",
-                        Values = ["American Express", "Discover", "Maestro", "Mastercard", "Visa"],
-                        Width = 120
+                        Values = ["American Express", "Discover", "Maestro", "Mastercard", "Visa"]
                     },
                     new MaskedTextEntryConfiguration
                     {
@@ -775,22 +774,19 @@ public record ItemConfiguration
                     {
                         Label = "Expiry Date",
                         Pattern = "00/00",
-                        Value = "__/__",
-                        Width = 120
+                        Value = "__/__"
                     },
                     new MaskedTextEntryConfiguration
                     {
                         Label = "Valid From",
                         Pattern = "00/00",
-                        Value = "__/__",
-                        Width = 120
+                        Value = "__/__"
                     },
                     new MaskedTextEntryConfiguration
                     {
                         Label = "Card verification code",
                         Pattern = "000",
-                        Value = "___",
-                        Width = 120
+                        Value = "___"
                     },
                 }
             },