diff --git a/app/build.gradle b/app/build.gradle
index db62f06..9639933 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -9,8 +9,8 @@ android {
         applicationId "net.mynero.wallet"
         minSdkVersion 21
         targetSdkVersion 34
-        versionCode 40404
-        versionName "0.4.4.4 'Fluorine Fermi'"
+        versionCode 40405
+        versionName "0.4.4.5 'Fluorine Fermi'"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         externalNativeBuild {
             cmake {
diff --git a/app/src/main/cpp/monerujo.cpp b/app/src/main/cpp/monerujo.cpp
index 440106a..eb73232 100644
--- a/app/src/main/cpp/monerujo.cpp
+++ b/app/src/main/cpp/monerujo.cpp
@@ -1135,10 +1135,11 @@ Java_net_mynero_wallet_model_Wallet_getCoinsJ(JNIEnv *env, jobject instance) {
 
 jobject newCoinsInfo(JNIEnv *env, Monero::CoinsInfo *info) {
     jmethodID c = env->GetMethodID(class_CoinsInfo, "<init>",
-                                   "(JZLjava/lang/String;JLjava/lang/String;Ljava/lang/String;ZJZ)V");
+                                   "(JZLjava/lang/String;JLjava/lang/String;Ljava/lang/String;ZJZLjava/lang/String;)V");
     jstring _key_image = env->NewStringUTF(info->keyImage().c_str());
     jstring _pub_key = env->NewStringUTF(info->pubKey().c_str());
     jstring _hash = env->NewStringUTF(info->hash().c_str());
+    jstring _address = env->NewStringUTF(info->address().c_str());
     jobject result = env->NewObject(class_CoinsInfo, c,
                                     static_cast<jlong> (info->globalOutputIndex()),
                                     info->spent(),
@@ -1148,10 +1149,12 @@ jobject newCoinsInfo(JNIEnv *env, Monero::CoinsInfo *info) {
                                     _pub_key,
                                     info->unlocked(),
                                     static_cast<jlong> (info->internalOutputIndex()),
-                                    info->frozen());
+                                    info->frozen(),
+                                    _address);
     env->DeleteLocalRef(_key_image);
     env->DeleteLocalRef(_hash);
     env->DeleteLocalRef(_pub_key);
+    env->DeleteLocalRef(_address);
     return result;
 }
 
diff --git a/app/src/main/java/net/mynero/wallet/adapter/CoinsInfoAdapter.java b/app/src/main/java/net/mynero/wallet/adapter/CoinsInfoAdapter.java
index caf0db3..3005222 100644
--- a/app/src/main/java/net/mynero/wallet/adapter/CoinsInfoAdapter.java
+++ b/app/src/main/java/net/mynero/wallet/adapter/CoinsInfoAdapter.java
@@ -138,22 +138,24 @@ public class CoinsInfoAdapter extends RecyclerView.Adapter<CoinsInfoAdapter.View
 
             TextView pubKeyTextView = itemView.findViewById(R.id.utxo_pub_key_textview);
             TextView amountTextView = itemView.findViewById(R.id.utxo_amount_textview);
+            TextView addressTextView = itemView.findViewById(R.id.utxo_address_textview);
             TextView globalIdxTextView = itemView.findViewById(R.id.utxo_global_index_textview);
             TextView outpointTextView = itemView.findViewById(R.id.utxo_outpoint_textview);
             boolean streetModeEnabled = PrefService.getInstance().getBoolean(Constants.PREF_STREET_MODE, false);
             String balanceString = streetModeEnabled ? Constants.STREET_MODE_BALANCE : Wallet.getDisplayAmount(coinsInfo.getAmount());
             amountTextView.setText(itemView.getResources().getString(R.string.tx_amount_no_prefix, balanceString));
             pubKeyTextView.setText(coinsInfo.getPubKey());
+            addressTextView.setText(coinsInfo.getAddress());
             globalIdxTextView.setText(itemView.getResources().getString(R.string.global_index_text, coinsInfo.getGlobalOutputIndex()));
             outpointTextView.setText(itemView.getResources().getString(R.string.outpoint_text, coinsInfo.getHash() + ":" + coinsInfo.getLocalOutputIndex()));
             if (selected) {
-                itemView.setBackgroundColor(ContextCompat.getColor(itemView.getContext(), R.color.oled_colorSecondary));
+                itemView.setBackgroundTintList(ContextCompat.getColorStateList(itemView.getContext(), R.color.oled_colorSecondary));
             } else if(coinsInfo.isFrozen()) {
-                itemView.setBackgroundColor(ContextCompat.getColor(itemView.getContext(), R.color.oled_frozen_utxo));
+                itemView.setBackgroundTintList(ContextCompat.getColorStateList(itemView.getContext(), R.color.oled_frozen_utxo));
             } else if (!coinsInfo.isUnlocked()) {
-                itemView.setBackgroundColor(ContextCompat.getColor(itemView.getContext(), R.color.oled_locked_utxo));
+                itemView.setBackgroundTintList(ContextCompat.getColorStateList(itemView.getContext(), R.color.oled_locked_utxo));
             } else {
-                itemView.setBackgroundColor(ContextCompat.getColor(itemView.getContext(), android.R.color.transparent));
+                itemView.setBackgroundTintList(ContextCompat.getColorStateList(itemView.getContext(), R.color.oled_dialogBackgroundColor));
             }
         }
 
diff --git a/app/src/main/java/net/mynero/wallet/model/CoinsInfo.java b/app/src/main/java/net/mynero/wallet/model/CoinsInfo.java
index 962c418..b6756cb 100644
--- a/app/src/main/java/net/mynero/wallet/model/CoinsInfo.java
+++ b/app/src/main/java/net/mynero/wallet/model/CoinsInfo.java
@@ -47,8 +47,9 @@ public class CoinsInfo implements Parcelable, Comparable<CoinsInfo> {
     boolean unlocked;
     long localOutputIndex;
     boolean frozen;
+    String address;
 
-    public CoinsInfo(long globalOutputIndex, boolean spent, String keyImage, long amount, String hash, String pubKey, boolean unlocked, long localOutputIndex, boolean frozen) {
+    public CoinsInfo(long globalOutputIndex, boolean spent, String keyImage, long amount, String hash, String pubKey, boolean unlocked, long localOutputIndex, boolean frozen, String address) {
         this.globalOutputIndex = globalOutputIndex;
         this.spent = spent;
         this.keyImage = keyImage;
@@ -58,6 +59,7 @@ public class CoinsInfo implements Parcelable, Comparable<CoinsInfo> {
         this.unlocked = unlocked;
         this.localOutputIndex = localOutputIndex;
         this.frozen = frozen;
+        this.address = address;
     }
 
     protected CoinsInfo(Parcel in) {
@@ -100,6 +102,10 @@ public class CoinsInfo implements Parcelable, Comparable<CoinsInfo> {
         return frozen;
     }
 
+    public String getAddress() {
+        return address;
+    }
+
     @Override
     public int describeContents() {
         return 0;
diff --git a/app/src/main/res/drawable/xmrchan_empty.png b/app/src/main/res/drawable/xmrchan_empty.png
index fcc933c..3f3553d 100644
Binary files a/app/src/main/res/drawable/xmrchan_empty.png and b/app/src/main/res/drawable/xmrchan_empty.png differ
diff --git a/app/src/main/res/drawable/xmrchan_half.png b/app/src/main/res/drawable/xmrchan_half.png
index 3940c48..202cbf5 100644
Binary files a/app/src/main/res/drawable/xmrchan_half.png and b/app/src/main/res/drawable/xmrchan_half.png differ
diff --git a/app/src/main/res/drawable/xmrchan_loading.png b/app/src/main/res/drawable/xmrchan_loading.png
index 20366cb..8bf19fe 100644
Binary files a/app/src/main/res/drawable/xmrchan_loading.png and b/app/src/main/res/drawable/xmrchan_loading.png differ
diff --git a/app/src/main/res/layout/fragment_onboarding.xml b/app/src/main/res/layout/fragment_onboarding.xml
index c4fa189..fe19bda 100644
--- a/app/src/main/res/layout/fragment_onboarding.xml
+++ b/app/src/main/res/layout/fragment_onboarding.xml
@@ -3,212 +3,220 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:paddingEnd="24dp"
-    android:paddingStart="24dp"
-    android:paddingTop="24dp">
+    android:layout_height="match_parent">
     <ImageView
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:scaleType="fitEnd"
         android:src="@drawable/xmrchan_half"
         app:layout_constraintBottom_toBottomOf="parent"/>
-    <TextView
-        android:id="@+id/create_wallet_textview"
+    <ScrollView
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="16dp"
-        android:text="@string/create_wallet"
-        android:textSize="32sp"
-        android:textStyle="bold"
-        app:layout_constraintBottom_toTopOf="@id/wallet_password_edittext"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <EditText
-        android:id="@+id/wallet_password_edittext"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:background="@drawable/edittext_bg"
-        android:hint="@string/password_optional"
-        android:inputType="textPassword"
-        android:minHeight="48dp"
-        app:layout_constraintBottom_toTopOf="@id/wallet_password_confirm_edittext"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/create_wallet_textview"
-        tools:visibility="visible" />
-
-    <EditText
-        android:id="@+id/wallet_password_confirm_edittext"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="16dp"
-        android:background="@drawable/edittext_bg"
-        android:hint="@string/password_confirm"
-        android:inputType="textPassword"
-        android:visibility="gone"
-        app:layout_constraintBottom_toTopOf="@id/seed_offset_checkbox"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/wallet_password_edittext"
-        tools:visibility="gone" />
-
-    <CheckBox
-        android:id="@+id/seed_offset_checkbox"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:minHeight="48dp"
-        android:text="@string/use_password_as_seed_offset"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/wallet_password_confirm_edittext"/>
-
-    <TextView
-        android:id="@+id/advanced_settings_dropdown_textview"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="8dp"
-        android:layout_marginTop="8dp"
-        android:text="@string/more_options"
-        android:textStyle="bold"
-        android:paddingTop="4dp"
-        android:paddingBottom="4dp"
-        app:layout_constraintBottom_toTopOf="@id/more_options_layout"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.0"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/seed_offset_checkbox" />
-
-    <ImageView
-        android:id="@+id/advanced_settings_chevron_imageview"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:minWidth="24dp"
-        android:minHeight="24dp"
-        android:src="@drawable/ic_keyboard_arrow_down"
-        app:layout_constraintBottom_toBottomOf="@id/advanced_settings_dropdown_textview"
-        app:layout_constraintStart_toEndOf="@id/advanced_settings_dropdown_textview"
-        app:layout_constraintTop_toTopOf="@id/advanced_settings_dropdown_textview" />
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/more_options_layout"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/advanced_settings_dropdown_textview">
-        <Button
-            android:id="@+id/select_node_button"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="16dp"
-            android:paddingStart="16dp"
-            android:paddingEnd="16dp"
-            tools:text="aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
-            android:background="@drawable/button_bg"
-            android:ellipsize="middle"
-            android:singleLine="true"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintHorizontal_bias="0.0"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            tools:ignore="SpeakableTextPresentCheck" />
-
-        <EditText
-            android:id="@+id/wallet_seed_edittext"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="16dp"
-            android:layout_marginTop="32dp"
-            android:background="@drawable/edittext_bg"
-            android:hint="@string/recovery_phrase_optional"
-            android:minHeight="48dp"
-            app:layout_constraintBottom_toTopOf="@id/wallet_restore_height_edittext"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/select_node_button" />
-
-        <EditText
-            android:id="@+id/wallet_restore_height_edittext"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:background="@drawable/edittext_bg"
-            android:hint="@string/restore_height_optional"
-            android:inputType="number"
-            android:minHeight="48dp"
-            app:layout_constraintBottom_toTopOf="@id/tor_onboarding_switch"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/wallet_seed_edittext" />
-
-        <TextView
-            android:id="@+id/tor_onboarding_switch_label"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:text="@string/tor_switch_label"
-            android:textSize="16sp"
-            app:layout_constraintBottom_toBottomOf="@id/tor_onboarding_switch"
-            app:layout_constraintEnd_toStartOf="@id/tor_onboarding_switch"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="@id/tor_onboarding_switch" />
-
-        <androidx.appcompat.widget.SwitchCompat
-            android:id="@+id/tor_onboarding_switch"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:minHeight="48dp"
-            android:minWidth="48dp"
-            android:layout_marginTop="16dp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/wallet_restore_height_edittext" />
-
+        android:layout_height="match_parent">
         <androidx.constraintlayout.widget.ConstraintLayout
-            android:id="@+id/wallet_proxy_settings_layout"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:visibility="gone"
-            app:layout_constraintTop_toBottomOf="@id/tor_onboarding_switch"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            tools:visibility="visible">
-            <EditText
-                android:id="@+id/wallet_proxy_address_edittext"
-                android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:paddingEnd="24dp"
+            android:paddingStart="24dp"
+            android:paddingTop="24dp">
+            <TextView
+                android:id="@+id/create_wallet_textview"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="16dp"
-                android:layout_marginTop="16dp"
-                android:background="@drawable/edittext_bg"
-                android:hint="@string/wallet_proxy_address_hint"
-                android:minHeight="48dp"
-                app:layout_constraintBottom_toTopOf="@id/wallet_proxy_port_edittext"
+                android:text="@string/create_wallet"
+                android:textSize="32sp"
+                android:textStyle="bold"
+                app:layout_constraintBottom_toTopOf="@id/wallet_password_edittext"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
 
             <EditText
-                android:id="@+id/wallet_proxy_port_edittext"
+                android:id="@+id/wallet_password_edittext"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:background="@drawable/edittext_bg"
-                android:hint="@string/wallet_proxy_port_hint"
-                android:inputType="number"
+                android:hint="@string/password_optional"
+                android:inputType="textPassword"
                 android:minHeight="48dp"
-                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintBottom_toTopOf="@id/wallet_password_confirm_edittext"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/wallet_proxy_address_edittext" />
+                app:layout_constraintTop_toBottomOf="@id/create_wallet_textview"
+                tools:visibility="visible" />
+
+            <EditText
+                android:id="@+id/wallet_password_confirm_edittext"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="16dp"
+                android:background="@drawable/edittext_bg"
+                android:hint="@string/password_confirm"
+                android:inputType="textPassword"
+                android:visibility="gone"
+                app:layout_constraintBottom_toTopOf="@id/seed_offset_checkbox"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/wallet_password_edittext"
+                tools:visibility="gone" />
+
+            <CheckBox
+                android:id="@+id/seed_offset_checkbox"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:minHeight="48dp"
+                android:text="@string/use_password_as_seed_offset"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/wallet_password_confirm_edittext"/>
+
+            <TextView
+                android:id="@+id/advanced_settings_dropdown_textview"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="8dp"
+                android:layout_marginTop="8dp"
+                android:text="@string/more_options"
+                android:textStyle="bold"
+                android:paddingTop="4dp"
+                android:paddingBottom="4dp"
+                app:layout_constraintBottom_toTopOf="@id/more_options_layout"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintHorizontal_bias="0.0"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/seed_offset_checkbox" />
+
+            <ImageView
+                android:id="@+id/advanced_settings_chevron_imageview"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:minWidth="24dp"
+                android:minHeight="24dp"
+                android:src="@drawable/ic_keyboard_arrow_down"
+                app:layout_constraintBottom_toBottomOf="@id/advanced_settings_dropdown_textview"
+                app:layout_constraintStart_toEndOf="@id/advanced_settings_dropdown_textview"
+                app:layout_constraintTop_toTopOf="@id/advanced_settings_dropdown_textview" />
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/more_options_layout"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/advanced_settings_dropdown_textview">
+                <Button
+                    android:id="@+id/select_node_button"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="16dp"
+                    android:paddingStart="16dp"
+                    android:paddingEnd="16dp"
+                    tools:text="aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
+                    android:background="@drawable/button_bg"
+                    android:ellipsize="middle"
+                    android:singleLine="true"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintHorizontal_bias="0.0"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent"
+                    tools:ignore="SpeakableTextPresentCheck" />
+
+                <EditText
+                    android:id="@+id/wallet_seed_edittext"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="16dp"
+                    android:layout_marginTop="32dp"
+                    android:background="@drawable/edittext_bg"
+                    android:hint="@string/recovery_phrase_optional"
+                    android:minHeight="48dp"
+                    app:layout_constraintBottom_toTopOf="@id/wallet_restore_height_edittext"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/select_node_button" />
+
+                <EditText
+                    android:id="@+id/wallet_restore_height_edittext"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:background="@drawable/edittext_bg"
+                    android:hint="@string/restore_height_optional"
+                    android:inputType="number"
+                    android:minHeight="48dp"
+                    app:layout_constraintBottom_toTopOf="@id/tor_onboarding_switch"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/wallet_seed_edittext" />
+
+                <TextView
+                    android:id="@+id/tor_onboarding_switch_label"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:text="@string/tor_switch_label"
+                    android:textSize="16sp"
+                    app:layout_constraintBottom_toBottomOf="@id/tor_onboarding_switch"
+                    app:layout_constraintEnd_toStartOf="@id/tor_onboarding_switch"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="@id/tor_onboarding_switch" />
+
+                <androidx.appcompat.widget.SwitchCompat
+                    android:id="@+id/tor_onboarding_switch"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:minHeight="48dp"
+                    android:minWidth="48dp"
+                    android:layout_marginTop="16dp"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/wallet_restore_height_edittext" />
+
+                <androidx.constraintlayout.widget.ConstraintLayout
+                    android:id="@+id/wallet_proxy_settings_layout"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:visibility="gone"
+                    app:layout_constraintTop_toBottomOf="@id/tor_onboarding_switch"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    tools:visibility="visible">
+                    <EditText
+                        android:id="@+id/wallet_proxy_address_edittext"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginBottom="16dp"
+                        android:layout_marginTop="16dp"
+                        android:background="@drawable/edittext_bg"
+                        android:hint="@string/wallet_proxy_address_hint"
+                        android:minHeight="48dp"
+                        app:layout_constraintBottom_toTopOf="@id/wallet_proxy_port_edittext"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toTopOf="parent" />
+
+                    <EditText
+                        android:id="@+id/wallet_proxy_port_edittext"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:background="@drawable/edittext_bg"
+                        android:hint="@string/wallet_proxy_port_hint"
+                        android:inputType="number"
+                        android:minHeight="48dp"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toBottomOf="@id/wallet_proxy_address_edittext" />
+                </androidx.constraintlayout.widget.ConstraintLayout>
+            </androidx.constraintlayout.widget.ConstraintLayout>
+            <Button
+                android:id="@+id/create_wallet_button"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="32dp"
+                android:background="@drawable/button_bg"
+                android:text="@string/create_wallet"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/more_options_layout" />
         </androidx.constraintlayout.widget.ConstraintLayout>
-    </androidx.constraintlayout.widget.ConstraintLayout>
-    <Button
-        android:id="@+id/create_wallet_button"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="32dp"
-        android:background="@drawable/button_bg"
-        android:text="@string/create_wallet"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/more_options_layout" />
+    </ScrollView>
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/utxo_selection_item.xml b/app/src/main/res/layout/utxo_selection_item.xml
index 161923a..5704fda 100644
--- a/app/src/main/res/layout/utxo_selection_item.xml
+++ b/app/src/main/res/layout/utxo_selection_item.xml
@@ -4,8 +4,9 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:padding="8dp"
-    android:layout_marginBottom="8dp">
+    android:padding="12dp"
+    android:layout_marginBottom="8dp"
+    android:background="@drawable/round_bg">
     <TextView
         android:id="@+id/utxo_coin_label"
         android:layout_width="wrap_content"
@@ -16,7 +17,7 @@
         android:textColor="@color/oled_addressListColor"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toStartOf="@id/utxo_outpoint_textview"
-        app:layout_constraintBottom_toTopOf="@id/utxo_pub_key_label"
+        app:layout_constraintBottom_toTopOf="@id/utxo_address_label"
         app:layout_constraintTop_toTopOf="parent"/>
     <TextView
         android:id="@+id/utxo_outpoint_textview"
@@ -30,32 +31,60 @@
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintStart_toEndOf="@id/utxo_coin_label"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintBottom_toTopOf="@id/utxo_pub_key_label"
+        app:layout_constraintBottom_toTopOf="@id/utxo_address_label"
         android:singleLine="true" />
     <TextView
-        android:id="@+id/utxo_pub_key_label"
-        android:layout_width="match_parent"
+        android:id="@+id/utxo_address_label"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="Public Key"
+        android:text="Address"
         android:textStyle="bold"
         android:textSize="20sp"
         android:layout_marginStart="16dp"
 
         android:textColor="@color/oled_addressListColor"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintBottom_toTopOf="@id/utxo_pub_key_textview"
+        app:layout_constraintEnd_toStartOf="@id/utxo_address_textview"
+        app:layout_constraintBottom_toTopOf="@id/utxo_pub_key_label"
         app:layout_constraintTop_toBottomOf="@id/utxo_coin_label"/>
+    <TextView
+        android:id="@+id/utxo_address_textview"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:text="Address"
+        android:textSize="14sp"
+        android:ellipsize="middle"
+        android:layout_marginStart="8dp"
+        android:singleLine="true"
+        app:layout_constraintStart_toEndOf="@id/utxo_address_label"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintBottom_toTopOf="@id/utxo_address_label"
+        app:layout_constraintTop_toBottomOf="@id/utxo_address_label"/>
+    <TextView
+        android:id="@+id/utxo_pub_key_label"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Public Key"
+        android:textStyle="bold"
+        android:textSize="20sp"
+        android:layout_marginStart="16dp"
+        android:textColor="@color/oled_addressListColor"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toStartOf="@id/utxo_pub_key_textview"
+        app:layout_constraintBottom_toTopOf="@id/utxo_amount_label"
+        app:layout_constraintTop_toBottomOf="@id/utxo_address_label"/>
     <TextView
         android:id="@+id/utxo_pub_key_textview"
-        android:layout_width="match_parent"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:text="Public Key"
         android:textSize="14sp"
-        android:layout_marginStart="32dp"
-        app:layout_constraintStart_toStartOf="parent"
+        android:ellipsize="middle"
+        android:singleLine="true"
+        android:layout_marginStart="8dp"
+        app:layout_constraintStart_toEndOf="@id/utxo_pub_key_label"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintBottom_toTopOf="@id/utxo_amount_label"
+        app:layout_constraintBottom_toTopOf="@id/utxo_pub_key_label"
         app:layout_constraintTop_toBottomOf="@id/utxo_pub_key_label"/>
     <TextView
         android:id="@+id/utxo_amount_label"