diff --git a/app/src/main/java/net/mynero/wallet/fragment/receive/ReceiveFragment.java b/app/src/main/java/net/mynero/wallet/fragment/receive/ReceiveFragment.java
index c7dc8a3..67a6963 100644
--- a/app/src/main/java/net/mynero/wallet/fragment/receive/ReceiveFragment.java
+++ b/app/src/main/java/net/mynero/wallet/fragment/receive/ReceiveFragment.java
@@ -63,7 +63,7 @@ public class ReceiveFragment extends Fragment {
     }
 
     private void bindListeners(View view) {
-        ImageView freshAddressImageView = view.findViewById(R.id.fresh_address_imageview);
+        ImageButton freshAddressImageView = view.findViewById(R.id.fresh_address_imageview);
         freshAddressImageView.setOnClickListener(view1 -> {
             mViewModel.getFreshSubaddress();
         });
diff --git a/app/src/main/java/net/mynero/wallet/util/UriData.java b/app/src/main/java/net/mynero/wallet/util/UriData.java
index 4372346..9bf1f3d 100644
--- a/app/src/main/java/net/mynero/wallet/util/UriData.java
+++ b/app/src/main/java/net/mynero/wallet/util/UriData.java
@@ -23,9 +23,11 @@ public class UriData {
             String[] queryParts = queryParams.split("&");
             for (String param : queryParts) {
                 String[] paramParts = param.split("=");
-                String variable = paramParts[0];
-                String value = paramParts[1];
-                params.put(variable, value);
+                if(paramParts.length == 2) {
+                    String variable = paramParts[0];
+                    String value = paramParts[1];
+                    params.put(variable, value);
+                }
             }
         }
         boolean valid = Wallet.isAddressValid(finalAddress);
diff --git a/app/src/main/res/layout/add_node_bottom_sheet_dialog.xml b/app/src/main/res/layout/add_node_bottom_sheet_dialog.xml
index b61560f..dd50d11 100644
--- a/app/src/main/res/layout/add_node_bottom_sheet_dialog.xml
+++ b/app/src/main/res/layout/add_node_bottom_sheet_dialog.xml
@@ -48,9 +48,8 @@
             android:layout_marginStart="8dp"
             android:layout_marginEnd="8dp"
             android:background="@android:color/transparent"
-            android:minWidth="24dp"
-            android:minHeight="24dp"
-            android:padding="8dp"
+            android:minWidth="48dp"
+            android:minHeight="48dp"
             android:src="@drawable/ic_content_paste_24dp"
             app:layout_constraintBottom_toBottomOf="@id/address_edittext"
             app:layout_constraintEnd_toEndOf="parent"
@@ -103,9 +102,8 @@
             android:layout_marginStart="8dp"
             android:layout_marginEnd="8dp"
             android:background="@android:color/transparent"
-            android:minWidth="24dp"
-            android:minHeight="24dp"
-            android:padding="8dp"
+            android:minWidth="48dp"
+            android:minHeight="48dp"
             android:src="@drawable/ic_content_paste_24dp"
             app:layout_constraintBottom_toBottomOf="@id/username_edittext"
             app:layout_constraintEnd_toEndOf="parent"
@@ -134,9 +132,8 @@
             android:layout_marginStart="8dp"
             android:layout_marginEnd="8dp"
             android:background="@android:color/transparent"
-            android:minWidth="24dp"
-            android:minHeight="24dp"
-            android:padding="8dp"
+            android:minWidth="48dp"
+            android:minHeight="48dp"
             android:visibility="gone"
             android:src="@drawable/ic_content_paste_24dp"
             app:layout_constraintBottom_toBottomOf="@id/password_edittext"
diff --git a/app/src/main/res/layout/edit_node_bottom_sheet_dialog.xml b/app/src/main/res/layout/edit_node_bottom_sheet_dialog.xml
index 394addc..b55f3d0 100644
--- a/app/src/main/res/layout/edit_node_bottom_sheet_dialog.xml
+++ b/app/src/main/res/layout/edit_node_bottom_sheet_dialog.xml
@@ -48,9 +48,8 @@
             android:layout_marginStart="8dp"
             android:layout_marginEnd="8dp"
             android:background="@android:color/transparent"
-            android:minWidth="24dp"
-            android:minHeight="24dp"
-            android:padding="8dp"
+            android:minWidth="48dp"
+            android:minHeight="48dp"
             android:src="@drawable/ic_content_paste_24dp"
             app:layout_constraintBottom_toBottomOf="@id/address_edittext"
             app:layout_constraintEnd_toEndOf="parent"
@@ -92,9 +91,8 @@
             android:layout_marginStart="8dp"
             android:layout_marginEnd="8dp"
             android:background="@android:color/transparent"
-            android:minWidth="24dp"
-            android:minHeight="24dp"
-            android:padding="8dp"
+            android:minWidth="48dp"
+            android:minHeight="48dp"
             android:src="@drawable/ic_content_paste_24dp"
             app:layout_constraintBottom_toBottomOf="@id/username_edittext"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/fragment_receive.xml b/app/src/main/res/layout/fragment_receive.xml
index ec48939..7c1e184 100644
--- a/app/src/main/res/layout/fragment_receive.xml
+++ b/app/src/main/res/layout/fragment_receive.xml
@@ -20,11 +20,14 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <ImageView
+    <ImageButton
         android:id="@+id/fresh_address_imageview"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:background="@android:color/transparent"
         android:src="@drawable/lb_ic_replay"
+        android:minWidth="48dp"
+        android:minHeight="48dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="@id/recv_monero_textview"
         app:layout_constraintBottom_toBottomOf="@id/recv_monero_textview"
@@ -89,9 +92,8 @@
         android:layout_height="wrap_content"
         android:background="@android:color/transparent"
         android:layout_marginTop="16dp"
-        android:minWidth="24dp"
-        android:minHeight="24dp"
-        android:padding="8dp"
+        android:minWidth="48dp"
+        android:minHeight="48dp"
         android:src="@drawable/ic_content_copy_24dp"
         app:layout_constraintBottom_toTopOf="@id/address_list_recyclerview"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/fragment_transaction.xml b/app/src/main/res/layout/fragment_transaction.xml
index 27056a2..ee6b6d1 100644
--- a/app/src/main/res/layout/fragment_transaction.xml
+++ b/app/src/main/res/layout/fragment_transaction.xml
@@ -52,9 +52,8 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:background="@android:color/transparent"
-        android:minWidth="24dp"
-        android:minHeight="24dp"
-        android:padding="8dp"
+        android:minWidth="48dp"
+        android:minHeight="48dp"
         android:src="@drawable/ic_content_copy_24dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@id/transaction_hash_textview"
@@ -170,9 +169,8 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:background="@android:color/transparent"
-        android:minWidth="24dp"
-        android:minHeight="24dp"
-        android:padding="8dp"
+        android:minWidth="48dp"
+        android:minHeight="48dp"
         android:src="@drawable/ic_content_copy_24dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@id/transaction_address_textview"
diff --git a/app/src/main/res/layout/password_bottom_sheet_dialog.xml b/app/src/main/res/layout/password_bottom_sheet_dialog.xml
index d790606..12c0115 100644
--- a/app/src/main/res/layout/password_bottom_sheet_dialog.xml
+++ b/app/src/main/res/layout/password_bottom_sheet_dialog.xml
@@ -45,11 +45,10 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="8dp"
-            android:background="@android:color/transparent"
-            android:minWidth="24dp"
-            android:minHeight="24dp"
             android:layout_marginEnd="24dp"
-            android:padding="8dp"
+            android:background="@android:color/transparent"
+            android:minWidth="48dp"
+            android:minHeight="48dp"
             android:src="@drawable/ic_content_paste_24dp"
             app:layout_constraintBottom_toBottomOf="@id/wallet_password_edittext"
             app:layout_constraintEnd_toEndOf="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 3f5bf23..e18efb3 100644
--- a/app/src/main/res/layout/send_bottom_sheet_dialog.xml
+++ b/app/src/main/res/layout/send_bottom_sheet_dialog.xml
@@ -73,7 +73,6 @@
             android:background="@android:color/transparent"
             android:minWidth="48dp"
             android:minHeight="48dp"
-            android:padding="8dp"
             android:src="@drawable/ic_content_paste_24dp"
             app:layout_constraintBottom_toBottomOf="@id/address_edittext"
             app:layout_constraintEnd_toStartOf="@id/scan_address_imagebutton"
@@ -89,7 +88,6 @@
             android:background="@android:color/transparent"
             android:minWidth="48dp"
             android:minHeight="48dp"
-            android:padding="8dp"
             android:layout_marginEnd="24dp"
             android:src="@drawable/ic_scan"
             app:layout_constraintBottom_toBottomOf="@id/address_edittext"
diff --git a/app/src/main/res/layout/wallet_keys_bottom_sheet_dialog.xml b/app/src/main/res/layout/wallet_keys_bottom_sheet_dialog.xml
index 58546c2..21f071d 100644
--- a/app/src/main/res/layout/wallet_keys_bottom_sheet_dialog.xml
+++ b/app/src/main/res/layout/wallet_keys_bottom_sheet_dialog.xml
@@ -71,7 +71,7 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginTop="4dp"
-            android:textSize="16sp"
+            android:textSize="14sp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/wallet_seed_desc_textview"
@@ -108,7 +108,7 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginEnd="8dp"
-            android:textSize="16sp"
+            android:textSize="14sp"
             app:layout_constraintEnd_toStartOf="@id/copy_viewkey_imagebutton"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="@id/copy_viewkey_imagebutton"
@@ -120,9 +120,8 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:background="@android:color/transparent"
-            android:minWidth="24dp"
-            android:minHeight="24dp"
-            android:padding="8dp"
+            android:minWidth="48dp"
+            android:minHeight="48dp"
             android:src="@drawable/ic_content_copy_24dp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintVertical_bias="0.0"
@@ -145,7 +144,7 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginTop="4dp"
-            android:textSize="16sp"
+            android:textSize="14sp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/wallet_restore_height_label_textview"