diff --git a/Wallet.Avalonia/DateEntryView.axaml b/Wallet.Avalonia/DateEntryView.axaml
index 572255d..1e7d65b 100644
--- a/Wallet.Avalonia/DateEntryView.axaml
+++ b/Wallet.Avalonia/DateEntryView.axaml
@@ -7,11 +7,21 @@
     Header="{Binding Key}"
     IsExpanded="False">
     <SettingsExpander.Resources>
+		<ResourceDictionary>
+			<ResourceDictionary.ThemeDictionaries>
+				<ResourceDictionary x:Key="Light">
+					<StaticResource x:Key="DatePickerButtonBorderBrush" ResourceKey="ControlStrokeColorDefaultBrush" />
+					<StaticResource x:Key="DatePickerButtonBorderBrushPointerOver" ResourceKey="ControlStrokeColorDefaultBrush" />
+				</ResourceDictionary>
+				<ResourceDictionary x:Key="Dark">
+					<StaticResource x:Key="DatePickerButtonBorderBrush" ResourceKey="SubtleFillColorTransparentBrush" />
+					<StaticResource x:Key="DatePickerButtonBorderBrushPointerOver" ResourceKey="SubtleFillColorTransparentBrush" />
+				</ResourceDictionary>
+			</ResourceDictionary.ThemeDictionaries>
+		</ResourceDictionary>
         <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>
diff --git a/Wallet.Avalonia/DropdownEntryView.axaml b/Wallet.Avalonia/DropdownEntryView.axaml
index 3bfd1f4..e08591d 100644
--- a/Wallet.Avalonia/DropdownEntryView.axaml
+++ b/Wallet.Avalonia/DropdownEntryView.axaml
@@ -7,12 +7,22 @@
     Header="{Binding Key}"
     IsExpanded="False">
     <SettingsExpander.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.ThemeDictionaries>
+                <ResourceDictionary x:Key="Light">
+                    <StaticResource x:Key="ComboBoxBorderBrush" ResourceKey="ControlStrokeColorDefaultBrush" />
+                    <StaticResource x:Key="ComboBoxBorderBrushPointerOver" ResourceKey="ControlStrokeColorDefaultBrush" />
+                </ResourceDictionary>
+                <ResourceDictionary x:Key="Dark">
+                    <StaticResource x:Key="ComboBoxBorderBrush" ResourceKey="SubtleFillColorTransparentBrush" />
+                    <StaticResource x:Key="ComboBoxBorderBrushPointerOver" ResourceKey="SubtleFillColorTransparentBrush" />
+                </ResourceDictionary>
+            </ResourceDictionary.ThemeDictionaries>
+        </ResourceDictionary>
         <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>
-        <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 3c6c402..c8b472c 100644
--- a/Wallet.Avalonia/HyperlinkEntryView.axaml
+++ b/Wallet.Avalonia/HyperlinkEntryView.axaml
@@ -7,12 +7,22 @@
     Header="{Binding Key}"
     IsExpanded="False">
     <SettingsExpander.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.ThemeDictionaries>
+                <ResourceDictionary x:Key="Light">
+                    <StaticResource x:Key="TextControlBorderBrush" ResourceKey="ControlStrokeColorDefaultBrush" />
+                    <StaticResource x:Key="TextControlBorderBrushPointerOver" ResourceKey="ControlStrokeColorDefaultBrush" />
+                </ResourceDictionary>
+                <ResourceDictionary x:Key="Dark">
+                    <StaticResource x:Key="TextControlBorderBrush" ResourceKey="SubtleFillColorTransparentBrush" />
+                    <StaticResource x:Key="TextControlBorderBrushPointerOver" ResourceKey="SubtleFillColorTransparentBrush" />
+                </ResourceDictionary>
+            </ResourceDictionary.ThemeDictionaries>
+        </ResourceDictionary>
         <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>
-		<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 e1db23e..4d38cbb 100644
--- a/Wallet.Avalonia/ItemHeaderView.axaml
+++ b/Wallet.Avalonia/ItemHeaderView.axaml
@@ -7,14 +7,24 @@
     Margin="0,0,0,-18"
     x:DataType="vm:ItemHeaderViewModel">
     <UserControl.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.ThemeDictionaries>
+                <ResourceDictionary x:Key="Light">
+                    <StaticResource x:Key="TextControlBorderBrush" ResourceKey="ControlStrokeColorDefaultBrush" />
+                    <StaticResource x:Key="TextControlBorderBrushPointerOver" ResourceKey="ControlStrokeColorDefaultBrush" />
+                </ResourceDictionary>
+                <ResourceDictionary x:Key="Dark">
+                    <StaticResource x:Key="TextControlBorderBrush" ResourceKey="SubtleFillColorTransparentBrush" />
+                    <StaticResource x:Key="TextControlBorderBrushPointerOver" ResourceKey="SubtleFillColorTransparentBrush" />
+                </ResourceDictionary>
+            </ResourceDictionary.ThemeDictionaries>
+        </ResourceDictionary>
         <x:Double x:Key="PersonPictureSize">144</x:Double>
         <x:Double x:Key="ButtonSize">36</x:Double>
         <x:Double x:Key="TextBoxMaxWidth">360</x:Double>
         <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 22dd353..00677f7 100644
--- a/Wallet.Avalonia/MaskedTextEntryView.axaml
+++ b/Wallet.Avalonia/MaskedTextEntryView.axaml
@@ -7,12 +7,22 @@
     Header="{Binding Key}"
     IsExpanded="False">
     <SettingsExpander.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.ThemeDictionaries>
+                <ResourceDictionary x:Key="Light">
+                    <StaticResource x:Key="TextControlBorderBrush" ResourceKey="ControlStrokeColorDefaultBrush" />
+                    <StaticResource x:Key="TextControlBorderBrushPointerOver" ResourceKey="ControlStrokeColorDefaultBrush" />
+                </ResourceDictionary>
+                <ResourceDictionary x:Key="Dark">
+                    <StaticResource x:Key="TextControlBorderBrush" ResourceKey="SubtleFillColorTransparentBrush" />
+                    <StaticResource x:Key="TextControlBorderBrushPointerOver" ResourceKey="SubtleFillColorTransparentBrush" />
+                </ResourceDictionary>
+            </ResourceDictionary.ThemeDictionaries>
+        </ResourceDictionary>
         <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>
-		<SolidColorBrush x:Key="TextControlBorderBrush" Color="Transparent" />
-		<SolidColorBrush x:Key="TextControlBorderBrushPointerOver" Color="Transparent" />
     </SettingsExpander.Resources>
     <SettingsExpander.Action>
         <ItemEntryActionView />
diff --git a/Wallet.Avalonia/PasswordEntryView.axaml b/Wallet.Avalonia/PasswordEntryView.axaml
index 0736c07..de3874e 100644
--- a/Wallet.Avalonia/PasswordEntryView.axaml
+++ b/Wallet.Avalonia/PasswordEntryView.axaml
@@ -8,13 +8,23 @@
     Header="{Binding Key}"
     IsExpanded="False">
     <SettingsExpander.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.ThemeDictionaries>
+                <ResourceDictionary x:Key="Light">
+                    <StaticResource x:Key="TextControlBorderBrush" ResourceKey="ControlStrokeColorDefaultBrush" />
+                    <StaticResource x:Key="TextControlBorderBrushPointerOver" ResourceKey="ControlStrokeColorDefaultBrush" />
+                </ResourceDictionary>
+                <ResourceDictionary x:Key="Dark">
+                    <StaticResource x:Key="TextControlBorderBrush" ResourceKey="SubtleFillColorTransparentBrush" />
+                    <StaticResource x:Key="TextControlBorderBrushPointerOver" ResourceKey="SubtleFillColorTransparentBrush" />
+                </ResourceDictionary>
+            </ResourceDictionary.ThemeDictionaries>
+        </ResourceDictionary>
         <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>
         <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 3f79e7f..3b98adb 100644
--- a/Wallet.Avalonia/TextEntryView.axaml
+++ b/Wallet.Avalonia/TextEntryView.axaml
@@ -7,12 +7,22 @@
     Header="{Binding Key}"
     IsExpanded="False">
     <SettingsExpander.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.ThemeDictionaries>
+                <ResourceDictionary x:Key="Light">
+                    <StaticResource x:Key="TextControlBorderBrush" ResourceKey="ControlStrokeColorDefaultBrush" />
+                    <StaticResource x:Key="TextControlBorderBrushPointerOver" ResourceKey="ControlStrokeColorDefaultBrush" />
+                </ResourceDictionary>
+                <ResourceDictionary x:Key="Dark">
+                    <StaticResource x:Key="TextControlBorderBrush" ResourceKey="SubtleFillColorTransparentBrush" />
+                    <StaticResource x:Key="TextControlBorderBrushPointerOver" ResourceKey="SubtleFillColorTransparentBrush" />
+                </ResourceDictionary>
+            </ResourceDictionary.ThemeDictionaries>
+        </ResourceDictionary>
         <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>
-        <SolidColorBrush x:Key="TextControlBorderBrush" Color="Transparent" />
-        <SolidColorBrush x:Key="TextControlBorderBrushPointerOver" Color="Transparent" />
     </SettingsExpander.Resources>
     <SettingsExpander.Action>
         <ItemEntryActionView />