diff --git a/app/src/main/res/layout/transaction_output_item.xml b/app/src/main/res/layout/transaction_output_item.xml
index 58cc46f..ff9975b 100644
--- a/app/src/main/res/layout/transaction_output_item.xml
+++ b/app/src/main/res/layout/transaction_output_item.xml
@@ -4,14 +4,12 @@
     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"
-    android:background="@color/oled_txBackgroundColor">
+    android:layout_height="wrap_content">
 
     <EditText
         android:id="@+id/amount_edittext"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="24dp"
         android:layout_marginStart="24dp"
         android:layout_marginTop="4dp"
         android:background="@drawable/edittext_bg"
@@ -19,7 +17,7 @@
         android:inputType="numberDecimal"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintBottom_toTopOf="@id/address_edittext"
-        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintEnd_toStartOf="@id/paste_address_imagebutton"
         app:layout_constraintStart_toStartOf="parent"
         tools:visibility="visible" />
 
@@ -56,13 +54,14 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
+        android:layout_marginEnd="24dp"
         android:layout_marginBottom="4dp"
         android:background="@drawable/edittext_bg"
         android:layout_marginStart="8dp"
         android:ellipsize="middle"
         android:hint="@string/address"
         android:singleLine="true"
-        app:layout_constraintEnd_toStartOf="@id/paste_address_imagebutton"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@id/to_address_label_textview"
         app:layout_constraintTop_toBottomOf="@id/amount_edittext"
         tools:visibility="visible" />
@@ -70,15 +69,15 @@
         android:id="@+id/paste_address_imagebutton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="8dp"
+        android:layout_marginStart="4dp"
         android:background="@android:color/transparent"
         android:minWidth="48dp"
         android:minHeight="48dp"
         android:src="@drawable/ic_content_paste_24dp"
-        app:layout_constraintBottom_toBottomOf="@id/address_edittext"
+        app:layout_constraintBottom_toBottomOf="@id/amount_edittext"
         app:layout_constraintEnd_toStartOf="@id/scan_address_imagebutton"
-        app:layout_constraintStart_toEndOf="@id/address_edittext"
-        app:layout_constraintTop_toTopOf="@id/address_edittext"
+        app:layout_constraintStart_toEndOf="@id/amount_edittext"
+        app:layout_constraintTop_toTopOf="@id/amount_edittext"
         tools:ignore="SpeakableTextPresentCheck"
         tools:visibility="visible" />
 
@@ -90,10 +89,10 @@
         android:minWidth="48dp"
         android:minHeight="48dp"
         android:src="@drawable/ic_scan"
-        app:layout_constraintBottom_toBottomOf="@id/address_edittext"
+        app:layout_constraintBottom_toBottomOf="@id/amount_edittext"
         app:layout_constraintEnd_toStartOf="@id/remove_output_imagebutton"
         app:layout_constraintStart_toEndOf="@id/paste_address_imagebutton"
-        app:layout_constraintTop_toTopOf="@id/address_edittext"
+        app:layout_constraintTop_toTopOf="@id/amount_edittext"
         tools:ignore="SpeakableTextPresentCheck"
         tools:visibility="visible" />
     <ImageButton
@@ -105,10 +104,10 @@
         android:minHeight="48dp"
         android:layout_marginEnd="24dp"
         android:src="@android:drawable/ic_delete"
-        app:layout_constraintBottom_toBottomOf="@id/address_edittext"
+        app:layout_constraintBottom_toBottomOf="@id/amount_edittext"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@id/scan_address_imagebutton"
-        app:layout_constraintTop_toTopOf="@id/address_edittext"
+        app:layout_constraintTop_toTopOf="@id/amount_edittext"
         tools:ignore="SpeakableTextPresentCheck"
         tools:visibility="visible" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file