diff --git a/app/src/main/res/drawable/button_bg.xml b/app/src/main/res/drawable/button_bg.xml
new file mode 100644
index 0000000..00eb67d
--- /dev/null
+++ b/app/src/main/res/drawable/button_bg.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <padding
+        android:bottom="12dp"
+        android:left="12dp"
+        android:right="12dp"
+        android:top="12dp" />
+    <solid
+        android:color="@color/oled_colorSecondary"/>
+    <corners
+        android:radius="8dp"/>
+</shape>
diff --git a/app/src/main/res/drawable/edittext_bg.xml b/app/src/main/res/drawable/edittext_bg.xml
new file mode 100644
index 0000000..5a0f345
--- /dev/null
+++ b/app/src/main/res/drawable/edittext_bg.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <padding
+        android:bottom="12dp"
+        android:left="12dp"
+        android:right="12dp"
+        android:top="12dp" />
+    <solid
+        android:color="@color/edittext_bg_color"/>
+    <corners
+        android:radius="8dp"/>
+</shape>
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index dc21dc1..57c0d3b 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -9,11 +9,14 @@
     <ProgressBar
         android:id="@+id/sync_progress_bar"
         style="?android:attr/progressBarStyleHorizontal"
-        android:layout_width="match_parent"
-        android:indeterminate="true"
+        android:layout_width="0dp"
         android:layout_height="4dp"
+        android:indeterminate="true"
+        android:indeterminateTint="@color/oled_colorSecondary"
         android:progressDrawable="@drawable/sync_progress_bar_drawable"
-        app:layout_constraintTop_toTopOf="parent"/>
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
     <TextView
         android:id="@+id/balance_unlocked_textview"
@@ -58,6 +61,7 @@
         android:layout_marginStart="24dp"
         android:layout_marginEnd="24dp"
         android:layout_marginBottom="16dp"
+        android:background="@drawable/button_bg"
         android:text="Receive"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toStartOf="@id/send_button"
@@ -70,6 +74,7 @@
         android:layout_marginStart="24dp"
         android:layout_marginEnd="24dp"
         android:layout_marginBottom="16dp"
+        android:background="@drawable/button_bg"
         android:text="Send"
         app:layout_constraintStart_toEndOf="@id/receive_button"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/fragment_onboarding.xml b/app/src/main/res/layout/fragment_onboarding.xml
index 6dee492..b308e7a 100644
--- a/app/src/main/res/layout/fragment_onboarding.xml
+++ b/app/src/main/res/layout/fragment_onboarding.xml
@@ -13,6 +13,7 @@
         android:layout_marginStart="24dp"
         android:layout_marginEnd="12dp"
         android:layout_marginBottom="32dp"
+        android:background="@drawable/edittext_bg"
         android:hint="Password (optional)"
         android:inputType="textPassword"
         app:layout_constraintTop_toTopOf="parent"
@@ -27,6 +28,7 @@
         android:layout_marginStart="24dp"
         android:layout_marginEnd="12dp"
         android:layout_marginBottom="32dp"
+        android:background="@drawable/edittext_bg"
         android:hint="Recovery phrase (optional)"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
@@ -39,6 +41,7 @@
         android:layout_marginStart="24dp"
         android:layout_marginEnd="12dp"
         android:hint="Restore height (optional)"
+        android:background="@drawable/edittext_bg"
         android:inputType="number"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
@@ -51,6 +54,7 @@
         android:layout_marginStart="24dp"
         android:layout_marginEnd="24dp"
         android:layout_marginTop="32dp"
+        android:background="@drawable/button_bg"
         android:text="@string/create_wallet"
         app:layout_constraintTop_toBottomOf="@id/wallet_restore_height_edittext"
         app:layout_constraintStart_toStartOf="parent"/>
diff --git a/app/src/main/res/layout/receive_bottom_sheet_dialog.xml b/app/src/main/res/layout/receive_bottom_sheet_dialog.xml
index 3792938..b176492 100644
--- a/app/src/main/res/layout/receive_bottom_sheet_dialog.xml
+++ b/app/src/main/res/layout/receive_bottom_sheet_dialog.xml
@@ -12,14 +12,27 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
-
+        <TextView
+            android:id="@+id/recv_monero_textview"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/recv_monero"
+            android:layout_marginStart="24dp"
+            android:layout_marginEnd="24dp"
+            android:layout_marginBottom="32dp"
+            android:textSize="24sp"
+            android:textStyle="bold"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toTopOf="@id/monero_qr_imageview"/>
         <ImageView
             android:id="@+id/monero_qr_imageview"
             android:layout_width="256dp"
             android:layout_height="256dp"
             android:layout_marginTop="16dp"
             android:src="@drawable/ic_fingerprint"
-            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/recv_monero_textview"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"/>
 
diff --git a/app/src/main/res/layout/send_bottom_sheet_dialog.xml b/app/src/main/res/layout/send_bottom_sheet_dialog.xml
index c480dc7..b2bcca6 100644
--- a/app/src/main/res/layout/send_bottom_sheet_dialog.xml
+++ b/app/src/main/res/layout/send_bottom_sheet_dialog.xml
@@ -13,33 +13,59 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <EditText
-            android:id="@+id/address_edittext"
+        <TextView
+            android:id="@+id/send_monero_textview"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:text="@string/send_monero"
             android:layout_marginStart="24dp"
             android:layout_marginEnd="24dp"
             android:layout_marginBottom="32dp"
-            android:hint="Address"
+            android:textSize="24sp"
+            android:textStyle="bold"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toTopOf="@id/address_edittext"/>
+
+        <EditText
+            android:id="@+id/address_edittext"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="24dp"
+            android:layout_marginBottom="32dp"
+            android:background="@drawable/edittext_bg"
+            android:singleLine="true"
+            android:ellipsize="middle"
+            android:hint="@string/address"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/send_monero_textview"
+            app:layout_constraintEnd_toStartOf="@id/paste_address_imagebutton"
             app:layout_constraintBottom_toTopOf="@id/amount_edittext"/>
+
         <ImageButton
             android:id="@+id/paste_address_imagebutton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_marginEnd="24dp"
             android:background="@android:color/transparent"
+            android:minWidth="48dp"
+            android:minHeight="48dp"
             android:padding="8dp"
             android:src="@drawable/ic_content_paste_24dp"
-            app:layout_constraintTop_toTopOf="@id/address_edittext"
             app:layout_constraintBottom_toBottomOf="@id/address_edittext"
-            app:layout_constraintEnd_toEndOf="@id/address_edittext"/>
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@id/address_edittext"
+            app:layout_constraintTop_toTopOf="@id/address_edittext"
+            tools:ignore="SpeakableTextPresentCheck" />
         <EditText
             android:id="@+id/amount_edittext"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="24dp"
             android:layout_marginEnd="12dp"
-            android:hint="Amount"
+            android:background="@drawable/edittext_bg"
+            android:hint="@string/amount"
             android:inputType="numberDecimal"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toStartOf="@id/send_max_button"
@@ -51,18 +77,21 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="24dp"
             android:layout_marginEnd="12dp"
-            android:text="SENDING ALL"
+            android:padding="12dp"
+            android:text="@string/sending_all"
             android:textStyle="bold"
             android:visibility="gone"
             app:layout_constraintTop_toTopOf="@id/amount_edittext"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toStartOf="@id/send_max_button"
-            app:layout_constraintBottom_toBottomOf="@id/amount_edittext"/>
+            app:layout_constraintBottom_toBottomOf="@id/amount_edittext"
+            tools:visibility="visible"/>
         <Button
             android:id="@+id/send_max_button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginEnd="24dp"
+            android:background="@drawable/button_bg"
             android:text="@string/send_max"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="@id/amount_edittext"
@@ -75,7 +104,8 @@
             android:layout_marginStart="24dp"
             android:layout_marginEnd="24dp"
             android:layout_marginTop="32dp"
-            android:text="Send"
+            android:background="@drawable/button_bg"
+            android:text="@string/send"
             app:layout_constraintTop_toBottomOf="@id/amount_edittext"
             app:layout_constraintStart_toStartOf="parent"/>
 
diff --git a/app/src/main/res/values-night-v23/styles.xml b/app/src/main/res/values-night-v23/styles.xml
index 331c450..cd485ef 100644
--- a/app/src/main/res/values-night-v23/styles.xml
+++ b/app/src/main/res/values-night-v23/styles.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="MyMaterialTheme" parent="Theme.MaterialComponents.DayNight">
+    <style name="MyMaterialTheme" parent="Theme.AppCompat.DayNight.NoActionBar">
         <item name="android:windowLightStatusBar">false</item>
         <item name="windowNoTitle">true</item>
         <item name="windowActionBar">false</item>
         <item name="materialCardViewStyle">@style/AppCard</item>
-        <item name="materialButtonStyle">@style/AppButton</item>
     </style>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index 8216c42..21a636d 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -28,6 +28,7 @@
     <color name="oled_colorOnSecondary">@color/oled_colorOnPrimary</color>
     <color name="oled_colorError">@color/oled_favouriteColor</color>
     <color name="oled_colorOnError">#ffffff</color>
+    <color name="edittext_bg_color">#202020</color>
 
     <!-- CLASSIC -->
     <color name="classic_textColorPrimary">#ffffff</color>
diff --git a/app/src/main/res/values-night/styles.xml b/app/src/main/res/values-night/styles.xml
index f899519..a95d024 100644
--- a/app/src/main/res/values-night/styles.xml
+++ b/app/src/main/res/values-night/styles.xml
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <style name="MyMaterialTheme" parent="Theme.MaterialComponents.DayNight">
+    <style name="MyMaterialTheme" parent="Theme.AppCompat.DayNight.NoActionBar">
         <item name="windowNoTitle">true</item>
         <item name="windowActionBar">false</item>
         <item name="materialCardViewStyle">@style/AppCard</item>
-        <item name="materialButtonStyle">@style/AppButton</item>
     </style>
 
     <style name="AppCard" parent="Widget.MaterialComponents.CardView">
diff --git a/app/src/main/res/values-v23/styles.xml b/app/src/main/res/values-v23/styles.xml
index 2706f11..dee16f6 100644
--- a/app/src/main/res/values-v23/styles.xml
+++ b/app/src/main/res/values-v23/styles.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="MyMaterialTheme" parent="Theme.MaterialComponents.DayNight">
+    <style name="MyMaterialTheme" parent="Theme.AppCompat.DayNight.NoActionBar">
         <item name="android:windowLightStatusBar">true</item>
         <item name="windowNoTitle">true</item>
         <item name="windowActionBar">false</item>
         <item name="materialCardViewStyle">@style/AppCard</item>
-        <item name="materialButtonStyle">@style/AppButton</item>
     </style>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 708f928..070848d 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -28,6 +28,7 @@
     <color name="oled_colorOnSecondary">@color/oled_colorOnBackground</color>
     <color name="oled_colorError">@color/oled_negativeColor</color>
     <color name="oled_colorOnError">@color/oled_colorBackground</color>
+    <color name="edittext_bg_color">#CCCCCC</color>
 
     <!-- CLASSIC -->
     <color name="classic_textColorPrimary">#0C080C</color>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 3e31183..db24ae6 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -549,4 +549,10 @@
     <string name="display_recovery_phrase">Display recovery phrase</string>
     <string name="tor_switch_label">Enable Tor (requires Orbot or similar app)</string>
     <string name="connection_failed">Connection failed</string>
+    <string name="address">87MRtZPrWUCVUgcFHdsVb5MoZUcLtqfD3FvQVGwftFb8eSdMnE39JhAJcbuSW8X2vRaRsB9RQfuCpFciybJFHaz3QYPhCLw</string>
+    <string name="amount">0.00</string>
+    <string name="sending_all">SENDING ALL</string>
+    <string name="send">Send</string>
+    <string name="send_monero">Send Monero</string>
+    <string name="recv_monero">Receive Monero</string>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 688d270..989cb64 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="MyMaterialTheme" parent="Theme.MaterialComponents.DayNight">
+    <style name="MyMaterialTheme" parent="Theme.AppCompat.DayNight.NoActionBar">
         <item name="windowNoTitle">true</item>
         <item name="windowActionBar">false</item>
         <item name="materialCardViewStyle">@style/AppCard</item>
-        <item name="materialButtonStyle">@style/AppButton</item>
     </style>
 
     <style name="MyMaterialThemeOled" parent="MyMaterialTheme">