diff --git a/res/layout/swap_confirm_receive.xml b/res/layout/swap_confirm_receive.xml
index e0d7a8704..d2e114e0c 100644
--- a/res/layout/swap_confirm_receive.xml
+++ b/res/layout/swap_confirm_receive.xml
@@ -55,7 +55,9 @@
                 style="@style/SwapTheme.Wizard.ReceiveSwap.Deny"
                 android:layout_width="0dp"
                 android:layout_weight="1"
-                android:layout_marginRight="8dp"/>
+                android:layout_marginEnd="8dp"
+                android:layout_marginRight="8dp"
+                />
 
 
         <Button
@@ -67,4 +69,4 @@
 
     </LinearLayout>
 
-</RelativeLayout>
\ No newline at end of file
+</RelativeLayout>
diff --git a/res/layout/swap_learn_about_wifi.xml b/res/layout/swap_learn_about_wifi.xml
index 511091ef5..dc362c7a8 100644
--- a/res/layout/swap_learn_about_wifi.xml
+++ b/res/layout/swap_learn_about_wifi.xml
@@ -16,7 +16,9 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:gravity="center"
-            android:layout_marginRight="10dp">
+            android:layout_marginEnd="10dp"
+            android:layout_marginRight="10dp"
+            >
 
         <ImageView
                 android:id="@+id/wifi_icon_public"
@@ -83,7 +85,9 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:gravity="center"
-            android:layout_marginLeft="10dp">
+            android:layout_marginStart="10dp"
+            android:layout_marginLeft="10dp"
+            >
 
         <ImageView
                 android:id="@+id/wifi_icon_personal"
@@ -111,4 +115,4 @@
 
     </LinearLayout>
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>