diff --git a/ui/src/main/res/layout/tunnel_editor_fragment.xml b/ui/src/main/res/layout/tunnel_editor_fragment.xml
index 4c6d8fd4..d87e1efb 100644
--- a/ui/src/main/res/layout/tunnel_editor_fragment.xml
+++ b/ui/src/main/res/layout/tunnel_editor_fragment.xml
@@ -68,7 +68,6 @@
 
                         <com.google.android.material.textfield.TextInputLayout
                             android:id="@+id/interface_name_layout"
-                            style="@style/TextInputLayoutBase"
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
                             android:layout_margin="4dp"
@@ -88,7 +87,6 @@
 
                         <com.google.android.material.textfield.TextInputLayout
                             android:id="@+id/private_key_text_layout"
-                            style="@style/TextInputLayoutBase"
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
                             android:layout_margin="4dp"
@@ -111,7 +109,6 @@
 
                         <com.google.android.material.textfield.TextInputLayout
                             android:id="@+id/public_key_label_layout"
-                            style="@style/TextInputLayoutBase"
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
                             android:layout_margin="4dp"
@@ -135,7 +132,6 @@
 
                         <com.google.android.material.textfield.TextInputLayout
                             android:id="@+id/addresses_label_layout"
-                            style="@style/TextInputLayoutBase"
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
                             android:layout_margin="4dp"
@@ -156,7 +152,6 @@
 
                         <com.google.android.material.textfield.TextInputLayout
                             android:id="@+id/listen_port_label_layout"
-                            style="@style/TextInputLayoutBase"
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
                             android:layout_margin="4dp"
@@ -178,7 +173,6 @@
 
                         <com.google.android.material.textfield.TextInputLayout
                             android:id="@+id/dns_servers_label_layout"
-                            style="@style/TextInputLayoutBase"
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
                             android:layout_margin="4dp"
@@ -199,7 +193,6 @@
 
                         <com.google.android.material.textfield.TextInputLayout
                             android:id="@+id/mtu_label_layout"
-                            style="@style/TextInputLayoutBase"
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
                             android:layout_margin="4dp"
diff --git a/ui/src/main/res/layout/tunnel_editor_peer.xml b/ui/src/main/res/layout/tunnel_editor_peer.xml
index 77e47d40..2f3b0689 100644
--- a/ui/src/main/res/layout/tunnel_editor_peer.xml
+++ b/ui/src/main/res/layout/tunnel_editor_peer.xml
@@ -58,7 +58,6 @@
 
             <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/public_key_label_layout"
-                style="@style/TextInputLayoutBase"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_margin="4dp"
@@ -79,7 +78,6 @@
 
             <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/pre_shared_key_label_layout"
-                style="@style/TextInputLayoutBase"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_margin="4dp"
@@ -99,7 +97,6 @@
 
             <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/persistent_keepalive_label_layout"
-                style="@style/TextInputLayoutBase"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_margin="4dp"
@@ -119,7 +116,6 @@
 
             <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/endpoint_label_layout"
-                style="@style/TextInputLayoutBase"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_margin="4dp"
@@ -138,7 +134,6 @@
 
             <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/allowed_ips_label_layout"
-                style="@style/TextInputLayoutBase"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_margin="4dp"
diff --git a/ui/src/main/res/values-v21/styles.xml b/ui/src/main/res/values-v21/styles.xml
index fd53a5e8..c29f2df5 100644
--- a/ui/src/main/res/values-v21/styles.xml
+++ b/ui/src/main/res/values-v21/styles.xml
@@ -21,5 +21,6 @@
         <item name="alertDialogTheme">@style/AppTheme.Dialog</item>
         <item name="materialAlertDialogTheme">@style/AppTheme.Dialog</item>
         <item name="actionBarPopupTheme">@style/ThemeOverlay.MaterialComponents.ActionBar</item>
+        <item name="textInputStyle">@style/TextInputLayoutBase</item>
     </style>
 </resources>
diff --git a/ui/src/main/res/values-v27/styles.xml b/ui/src/main/res/values-v27/styles.xml
index 2f4b7107..dcdf974f 100644
--- a/ui/src/main/res/values-v27/styles.xml
+++ b/ui/src/main/res/values-v27/styles.xml
@@ -24,5 +24,6 @@
         <item name="alertDialogTheme">@style/AppTheme.Dialog</item>
         <item name="materialAlertDialogTheme">@style/AppTheme.Dialog</item>
         <item name="actionBarPopupTheme">@style/ThemeOverlay.MaterialComponents.ActionBar</item>
+        <item name="textInputStyle">@style/TextInputLayoutBase</item>
     </style>
 </resources>
diff --git a/ui/src/main/res/values/styles.xml b/ui/src/main/res/values/styles.xml
index ed1f9cd0..a5079b8d 100644
--- a/ui/src/main/res/values/styles.xml
+++ b/ui/src/main/res/values/styles.xml
@@ -20,6 +20,7 @@
         <item name="alertDialogTheme">@style/AppTheme.Dialog</item>
         <item name="materialAlertDialogTheme">@style/AppTheme.Dialog</item>
         <item name="actionBarPopupTheme">@style/ThemeOverlay.MaterialComponents.ActionBar</item>
+        <item name="textInputStyle">@style/TextInputLayoutBase</item>
     </style>
 
     <style name="AppTheme.Dialog" parent="Theme.MaterialComponents.DayNight.Dialog.Alert">
@@ -56,8 +57,13 @@
     <style name="DetailText" parent="TextAppearance.MaterialComponents.Body1" />
     <style name="SectionText" parent="TextAppearance.MaterialComponents.Subtitle1" />
 
+    <style name="ThemeOverlay.AppTheme.TextInputEditText.OutlinedBox" parent="ThemeOverlay.MaterialComponents.TextInputEditText.OutlinedBox">
+        <item name="colorControlActivated">@color/color_control_normal</item>
+    </style>
+
     <style name="TextInputLayoutBase" parent="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox">
         <item name="boxStrokeColor">?attr/colorSecondary</item>
         <item name="hintTextColor">?attr/colorOnPrimary</item>
+        <item name="materialThemeOverlay">@style/ThemeOverlay.AppTheme.TextInputEditText.OutlinedBox</item>
     </style>
 </resources>