diff --git a/app/src/main/res/layout/apklistitem.xml b/app/src/main/res/layout/apklistitem.xml
index 3383f2c3c..6989b9286 100644
--- a/app/src/main/res/layout/apklistitem.xml
+++ b/app/src/main/res/layout/apklistitem.xml
@@ -64,7 +64,7 @@
                 android:gravity="end"
                 android:textAlignment="viewEnd"
                 tools:text=""
-                tools:visible="gone" />
+                tools:visibility="gone" />
 
       </LinearLayout>
 
@@ -97,7 +97,7 @@
             android:layout_height="wrap_content"
             android:layout_width="wrap_content"
             tools:text=""
-            tools:visible="gone" />
+            tools:visibility="gone" />
 
 
       <TextView android:id="@+id/incompatible_reasons"
@@ -108,6 +108,6 @@
             android:layout_height="wrap_content"
             android:layout_width="wrap_content"
             tools:text=""
-            tools:visible="gone" />
+            tools:visibility="gone" />
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout/swap_join_wifi.xml b/app/src/main/res/layout/swap_join_wifi.xml
index d6a9285d7..8df458f7b 100644
--- a/app/src/main/res/layout/swap_join_wifi.xml
+++ b/app/src/main/res/layout/swap_join_wifi.xml
@@ -6,7 +6,7 @@
       android:layout_height="match_parent"
       xmlns:tools="http://schemas.android.com/tools"
       android:background="@color/swap_blue"
-      tools:context=".views.swap.SwapActivity">
+      tools:context=".views.swap.SwapWorkflowActivity">
 
     <TextView
             android:layout_width="wrap_content"