diff --git a/app/src/main/res/layout/fr_loaded_wallet.xml b/app/src/main/res/layout/fr_loaded_wallet.xml
index c9e806b3db..85a18b6774 100644
--- a/app/src/main/res/layout/fr_loaded_wallet.xml
+++ b/app/src/main/res/layout/fr_loaded_wallet.xml
@@ -160,7 +160,7 @@
                             android:id="@+id/btnExplore"
                             style="@style/AppTheme.RoundedCornerMaterialButton"
                             android:layout_width="0dp"
-                            android:layout_height="34dp"
+                            android:layout_height="wrap_content"
                             android:layout_marginTop="10dp"
                             android:layout_marginBottom="5dp"
                             android:layout_weight="1"
@@ -177,7 +177,7 @@
                             android:id="@+id/btnCopy"
                             style="@style/AppTheme.RoundedCornerMaterialButton"
                             android:layout_width="0dp"
-                            android:layout_height="34dp"
+                            android:layout_height="wrap_content"
                             android:layout_marginTop="10dp"
                             android:layout_marginBottom="10dp"
                             android:layout_weight="1"
@@ -251,14 +251,11 @@
             android:id="@+id/btnLoad"
             style="@style/AppTheme.RoundedCornerMaterialButton"
             android:layout_width="0dp"
-            android:layout_height="50dp"
+            android:layout_height="wrap_content"
             android:layout_marginTop="10dp"
-            android:layout_marginBottom="5dp"
+            android:layout_marginBottom="10dp"
             android:layout_weight="1"
-            android:elevation="15dp"
             android:fontFamily="@font/saira_condensed_bold"
-            android:paddingLeft="20dp"
-            android:paddingRight="20dp"
             android:text="@string/load"
             android:textSize="@dimen/text_size_large" />
 
@@ -266,15 +263,12 @@
             android:id="@+id/btnExtract"
             style="@style/AppTheme.RoundedCornerMaterialButton"
             android:layout_width="0dp"
-            android:layout_height="50dp"
+            android:layout_height="wrap_content"
             android:layout_marginTop="10dp"
-            android:layout_marginBottom="5dp"
+            android:layout_marginBottom="10dp"
             android:layout_weight="1"
-            android:elevation="15dp"
             android:enabled="false"
             android:fontFamily="@font/saira_condensed_bold"
-            android:paddingLeft="20dp"
-            android:paddingRight="20dp"
             android:text="@string/extract"
             android:textSize="@dimen/text_size_large" />
 
@@ -285,8 +279,6 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:gravity="center"
-        android:paddingTop="10dp"
-        android:paddingBottom="10dp"
         app:layout_constraintBottom_toBottomOf="parent">
 
         <include layout="@layout/layout_btn_details" />
@@ -295,13 +287,12 @@
             android:id="@+id/btnNewScan"
             style="@style/AppTheme.RoundedCornerMaterialButton"
             android:layout_width="0dp"
-            android:layout_height="34dp"
-            android:layout_marginTop="5dp"
-            android:layout_marginBottom="5dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            android:layout_marginBottom="10dp"
             android:layout_weight="1"
             android:backgroundTint="@color/white"
             android:drawableStart="@drawable/ic_nfc_white_24dp"
-            android:elevation="15dp"
             android:fontFamily="@font/saira_condensed_bold"
             android:paddingLeft="20dp"
             android:paddingRight="20dp"
diff --git a/app/src/main/res/layout/layout_btn_details.xml b/app/src/main/res/layout/layout_btn_details.xml
index 34de9aff03..b10556cf5f 100644
--- a/app/src/main/res/layout/layout_btn_details.xml
+++ b/app/src/main/res/layout/layout_btn_details.xml
@@ -4,13 +4,12 @@
     android:id="@+id/btnDetails"
     style="@style/AppTheme.RoundedCornerMaterialButton"
     android:layout_width="0dp"
-    android:layout_height="34dp"
-    android:layout_marginTop="5dp"
-    android:layout_marginBottom="5dp"
+    android:layout_height="wrap_content"
+    android:layout_marginTop="10dp"
+    android:layout_marginBottom="10dp"
     android:layout_weight="1"
     android:backgroundTint="@color/white"
     android:drawableStart="@drawable/ic_settings_black_24dp"
-    android:elevation="15dp"
     android:fontFamily="@font/saira_condensed_bold"
     android:paddingLeft="20dp"
     android:paddingRight="20dp"