diff --git a/app/src/main/res/layout/fragment_generate.xml b/app/src/main/res/layout/fragment_generate.xml
index 8c132df..3a6492e 100644
--- a/app/src/main/res/layout/fragment_generate.xml
+++ b/app/src/main/res/layout/fragment_generate.xml
@@ -18,11 +18,13 @@
 
             <android.support.design.widget.TextInputLayout
                 android:id="@+id/etWalletName"
+                style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 app:counterEnabled="true"
                 app:counterMaxLength="20"
+                android:layout_marginEnd="4dp"
                 app:errorEnabled="true">
 
                 <android.support.design.widget.TextInputEditText
@@ -39,7 +41,9 @@
 
             <android.support.design.widget.TextInputLayout
                 android:id="@+id/etWalletPassword"
+                style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox"
                 android:layout_width="0dp"
+                android:layout_marginStart="4dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1">
 
@@ -78,6 +82,7 @@
 
         <android.support.design.widget.TextInputLayout
             android:id="@+id/etWalletMnemonic"
+            style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:visibility="gone"
@@ -95,6 +100,7 @@
 
         <android.support.design.widget.TextInputLayout
             android:id="@+id/etWalletAddress"
+            style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:visibility="gone"
@@ -115,6 +121,7 @@
 
         <android.support.design.widget.TextInputLayout
             android:id="@+id/etWalletViewKey"
+            style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:visibility="gone"
@@ -134,6 +141,7 @@
 
         <android.support.design.widget.TextInputLayout
             android:id="@+id/etWalletSpendKey"
+            style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:visibility="gone"
@@ -153,6 +161,7 @@
 
         <android.support.design.widget.TextInputLayout
             android:id="@+id/etWalletRestoreHeight"
+            style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:visibility="gone"
diff --git a/app/src/main/res/layout/fragment_receive.xml b/app/src/main/res/layout/fragment_receive.xml
index ee91ffd..4680afe 100644
--- a/app/src/main/res/layout/fragment_receive.xml
+++ b/app/src/main/res/layout/fragment_receive.xml
@@ -84,16 +84,17 @@
             android:id="@+id/evAmount"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="16dp"
             android:layout_marginTop="16dp"
+            android:layout_marginBottom="16dp"
             android:orientation="vertical" />
 
         <android.support.design.widget.TextInputLayout
             android:id="@+id/etNotes"
+            style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox"
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
 
-            <EditText
+            <android.support.design.widget.TextInputEditText
                 style="@style/MoneroEdit"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -101,7 +102,6 @@
                 android:imeOptions="actionDone"
                 android:inputType="textMultiLine"
                 android:textAlignment="textStart" />
-
         </android.support.design.widget.TextInputLayout>
 
         <RelativeLayout
@@ -128,8 +128,8 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center"
-                    android:drawablePadding="4dp"
                     android:drawableStart="@drawable/ic_info_outline_gray_24dp"
+                    android:drawablePadding="4dp"
                     android:text="@string/label_receive_info_gen_qr_code"
                     android:textAlignment="center"
                     android:textSize="16sp"
@@ -149,8 +149,8 @@
                 android:layout_height="wrap_content"
                 android:layout_alignParentBottom="true"
                 android:layout_centerHorizontal="true"
-                android:drawablePadding="8dp"
                 android:drawableStart="@drawable/ic_nfc_black_24dp"
+                android:drawablePadding="8dp"
                 android:gravity="center"
                 android:text="@string/nfc_tag_tap"
                 android:visibility="visible" />
diff --git a/app/src/main/res/layout/fragment_send_address.xml b/app/src/main/res/layout/fragment_send_address.xml
index de4a573..5f9bd56 100644
--- a/app/src/main/res/layout/fragment_send_address.xml
+++ b/app/src/main/res/layout/fragment_send_address.xml
@@ -29,6 +29,7 @@
                 android:orientation="horizontal">
 
                 <android.support.design.widget.TextInputLayout
+                    style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox"
                     android:id="@+id/etAddress"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -118,6 +119,7 @@
                     android:visibility="visible">
 
                     <android.support.design.widget.TextInputLayout
+                        style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox"
                         android:id="@+id/etPaymentId"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
@@ -153,11 +155,12 @@
             </FrameLayout>
 
             <android.support.design.widget.TextInputLayout
+                style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox"
                 android:id="@+id/etNotes"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
 
-                <EditText
+                <android.support.design.widget.TextInputEditText
                     style="@style/MoneroEdit"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/fragment_tx_info.xml b/app/src/main/res/layout/fragment_tx_info.xml
index 82f5d0b..0cf8f89 100644
--- a/app/src/main/res/layout/fragment_tx_info.xml
+++ b/app/src/main/res/layout/fragment_tx_info.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -225,14 +226,20 @@
                     android:padding="8sp"
                     android:text="@string/tx_notes" />
 
-                <EditText
-                    android:id="@+id/etTxNotes"
-                    style="@style/MoneroEdit"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:backgroundTint="@color/moneroGray"
-                    android:hint="@string/tx_notes_hint"
-                    android:inputType="textMultiLine" />
+                <android.support.design.widget.TextInputLayout
+                    style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+
+                    <android.support.design.widget.TextInputEditText
+                        android:id="@+id/etTxNotes"
+                        style="@style/MoneroEdit"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:backgroundTint="@color/moneroGray"
+                        android:hint="@string/tx_notes_hint"
+                        android:inputType="textMultiLine" />
+                </android.support.design.widget.TextInputLayout>
             </TableRow>
 
             <TableRow>
diff --git a/app/src/main/res/layout/prompt_changepw.xml b/app/src/main/res/layout/prompt_changepw.xml
index 6c1260f..25fd80c 100644
--- a/app/src/main/res/layout/prompt_changepw.xml
+++ b/app/src/main/res/layout/prompt_changepw.xml
@@ -12,6 +12,7 @@
 
         <android.support.design.widget.TextInputLayout
             android:id="@+id/etWalletPasswordA"
+            style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             app:errorEnabled="true">
@@ -28,6 +29,7 @@
 
         <android.support.design.widget.TextInputLayout
             android:id="@+id/etWalletPasswordB"
+            style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/section_top"
diff --git a/app/src/main/res/layout/prompt_editnode.xml b/app/src/main/res/layout/prompt_editnode.xml
index 83ec991..dde3e41 100644
--- a/app/src/main/res/layout/prompt_editnode.xml
+++ b/app/src/main/res/layout/prompt_editnode.xml
@@ -8,8 +8,8 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="16dp"
         android:layout_marginStart="16dp"
+        android:layout_marginTop="16dp"
         android:layout_marginEnd="16dp"
         android:orientation="vertical">
 
@@ -22,6 +22,7 @@
 
             <android.support.design.widget.TextInputLayout
                 android:id="@+id/etNodeHost"
+                style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="8"
@@ -41,6 +42,7 @@
 
             <android.support.design.widget.TextInputLayout
                 android:id="@+id/etNodePort"
+                style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="2"
@@ -61,6 +63,7 @@
 
         <android.support.design.widget.TextInputLayout
             android:id="@+id/etNodeName"
+            style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/data_top">
@@ -85,6 +88,7 @@
 
             <android.support.design.widget.TextInputLayout
                 android:id="@+id/etNodeUser"
+                style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1">
@@ -103,6 +107,7 @@
 
             <android.support.design.widget.TextInputLayout
                 android:id="@+id/etNodePass"
+                style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1">
@@ -142,8 +147,8 @@
                 style="@style/MoneroText.Medium"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="4dp"
                 android:layout_alignBaseline="@+id/tvResultLabel"
+                android:layout_marginStart="4dp"
                 android:layout_toEndOf="@+id/tvResultLabel"
                 android:textAlignment="textStart"
                 tools:text="Blockheight: 1710998 (v9), Ping: 187ms" />
diff --git a/app/src/main/res/layout/prompt_ledger_seed.xml b/app/src/main/res/layout/prompt_ledger_seed.xml
index 01acef4..d7111d3 100644
--- a/app/src/main/res/layout/prompt_ledger_seed.xml
+++ b/app/src/main/res/layout/prompt_ledger_seed.xml
@@ -20,12 +20,13 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginBottom="16dp"
-        android:textColor="@color/colorAccent"
         android:labelFor="@+id/etSeed"
-        android:text="@string/prompt_ledger_seed_warn" />
+        android:text="@string/prompt_ledger_seed_warn"
+        android:textColor="@color/colorAccent" />
 
     <android.support.design.widget.TextInputLayout
         android:id="@+id/etSeed"
+        style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:errorEnabled="true">
@@ -42,6 +43,7 @@
 
     <android.support.design.widget.TextInputLayout
         android:id="@+id/etPassphrase"
+        style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:errorEnabled="true">
diff --git a/app/src/main/res/layout/prompt_password.xml b/app/src/main/res/layout/prompt_password.xml
index fdd7e43..33a127e 100644
--- a/app/src/main/res/layout/prompt_password.xml
+++ b/app/src/main/res/layout/prompt_password.xml
@@ -8,10 +8,11 @@
 
     <android.support.design.widget.TextInputLayout
         android:id="@+id/etPassword"
+        style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:passwordToggleEnabled="true"
-        app:errorEnabled="true">
+        app:errorEnabled="true"
+        app:passwordToggleEnabled="true">
 
         <android.support.design.widget.TextInputEditText
             style="@style/MoneroEdit"
diff --git a/app/src/main/res/layout/prompt_rename.xml b/app/src/main/res/layout/prompt_rename.xml
index 0acfad6..7f50cc2 100644
--- a/app/src/main/res/layout/prompt_rename.xml
+++ b/app/src/main/res/layout/prompt_rename.xml
@@ -1,25 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    android:padding="8dp" >
+    android:padding="8dp">
 
     <TextView
         android:id="@+id/tvRenameLabel"
         style="@style/MoneroLabel"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="@string/prompt_rename"
         android:labelFor="@+id/etRename"
+        android:text="@string/prompt_rename"
         android:textAppearance="?android:attr/textAppearanceLarge" />
 
-    <EditText
-        android:id="@+id/etRename"
-        style="@style/MoneroEdit"
+    <android.support.design.widget.TextInputLayout
+        android:id="@+id/etPassword"
+        style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:imeOptions="normal"
-        android:inputType="text" />
+        android:layout_height="wrap_content">
 
+        <android.support.design.widget.TextInputEditText
+            android:id="@+id/etRename"
+            style="@style/MoneroEdit"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:imeOptions="normal"
+            android:inputType="text" />
+    </android.support.design.widget.TextInputLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/view_exchange.xml b/app/src/main/res/layout/view_exchange.xml
index bfc0795..f14d4fb 100644
--- a/app/src/main/res/layout/view_exchange.xml
+++ b/app/src/main/res/layout/view_exchange.xml
@@ -21,6 +21,7 @@
 
         <com.m2049r.xmrwallet.widget.CTextInputLayout
             android:id="@+id/etAmount"
+            style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
diff --git a/app/src/main/res/layout/view_exchange_btc_edit.xml b/app/src/main/res/layout/view_exchange_btc_edit.xml
index 156dbd3..8591849 100644
--- a/app/src/main/res/layout/view_exchange_btc_edit.xml
+++ b/app/src/main/res/layout/view_exchange_btc_edit.xml
@@ -17,21 +17,27 @@
             android:gravity="center"
             android:textAlignment="center" />
 
-        <EditText
-            android:id="@+id/etAmountA"
-            style="@style/MoneroText.Balance.Orange"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center|start"
-            android:layout_marginStart="16dp"
-            android:layout_weight="3"
-            android:hint="@string/send_amount_hint"
-            android:imeOptions="actionDone"
-            android:inputType="numberDecimal"
-            android:padding="4dp"
-            android:singleLine="true"
-            android:textAlignment="textStart"
-            tools:text="87.00000" />
+        <android.support.design.widget.TextInputLayout
+            style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <android.support.design.widget.TextInputEditText
+                android:id="@+id/etAmountA"
+                style="@style/MoneroText.Balance.Orange"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center|start"
+                android:layout_marginStart="16dp"
+                android:layout_weight="3"
+                android:hint="@string/send_amount_hint"
+                android:imeOptions="actionDone"
+                android:inputType="numberDecimal"
+                android:padding="4dp"
+                android:singleLine="true"
+                android:textAlignment="textStart"
+                tools:text="87.00000" />
+        </android.support.design.widget.TextInputLayout>
     </LinearLayout>
 
     <LinearLayout
diff --git a/app/src/main/res/layout/view_exchange_edit.xml b/app/src/main/res/layout/view_exchange_edit.xml
index ab502cd..3cf5c61 100644
--- a/app/src/main/res/layout/view_exchange_edit.xml
+++ b/app/src/main/res/layout/view_exchange_edit.xml
@@ -18,21 +18,27 @@
             android:gravity="center"
             android:textAlignment="center" />
 
-        <EditText
-            android:id="@+id/etAmountA"
-            style="@style/MoneroText.Balance.Orange"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center|start"
-            android:layout_marginStart="16dp"
-            android:layout_weight="3"
-            android:hint="@string/send_amount_hint"
-            android:imeOptions="actionDone"
-            android:inputType="numberDecimal"
-            android:padding="4dp"
-            android:singleLine="true"
-            android:textAlignment="textStart"
-            tools:text="87.00000" />
+        <android.support.design.widget.TextInputLayout
+            style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <android.support.design.widget.TextInputEditText
+                android:id="@+id/etAmountA"
+                style="@style/MoneroText.Balance.Orange"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center|start"
+                android:layout_marginStart="16dp"
+                android:layout_weight="3"
+                android:hint="@string/send_amount_hint"
+                android:imeOptions="actionDone"
+                android:inputType="numberDecimal"
+                android:padding="4dp"
+                android:singleLine="true"
+                android:textAlignment="textStart"
+                tools:text="87.00000" />
+        </android.support.design.widget.TextInputLayout>
     </LinearLayout>
 
     <LinearLayout