diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index eda9ba073..df38566c7 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -281,6 +281,15 @@
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value=".FDroid" />
         </activity>
+        <activity
+            android:label="@string/menu_swap"
+            android:name=".views.swap.SwapActivity"
+            android:parentActivityName=".FDroid"
+            android:theme="@style/SwapTheme.Wizard">
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value=".FDroid" />
+        </activity>
         <activity
             android:name=".SearchResults"
             android:label="@string/search_results"
diff --git a/res/drawable-hdpi/ic_swap.png b/res/drawable-hdpi/ic_swap.png
new file mode 100644
index 000000000..f88513142
Binary files /dev/null and b/res/drawable-hdpi/ic_swap.png differ
diff --git a/res/drawable-hdpi/nfc_touch.png b/res/drawable-hdpi/nfc_touch.png
new file mode 100644
index 000000000..6b494f0a5
Binary files /dev/null and b/res/drawable-hdpi/nfc_touch.png differ
diff --git a/res/drawable-hdpi/wifi.png b/res/drawable-hdpi/wifi.png
new file mode 100644
index 000000000..dc11620b0
Binary files /dev/null and b/res/drawable-hdpi/wifi.png differ
diff --git a/res/drawable-hdpi/wifi_ap_personal.png b/res/drawable-hdpi/wifi_ap_personal.png
new file mode 100644
index 000000000..8468b1ffb
Binary files /dev/null and b/res/drawable-hdpi/wifi_ap_personal.png differ
diff --git a/res/drawable-hdpi/wifi_ap_private.png b/res/drawable-hdpi/wifi_ap_private.png
new file mode 100644
index 000000000..6805f8c1e
Binary files /dev/null and b/res/drawable-hdpi/wifi_ap_private.png differ
diff --git a/res/drawable-hdpi/wifi_ap_public.png b/res/drawable-hdpi/wifi_ap_public.png
new file mode 100644
index 000000000..0b71a9dd5
Binary files /dev/null and b/res/drawable-hdpi/wifi_ap_public.png differ
diff --git a/res/drawable-ldpi/ic_swap.png b/res/drawable-ldpi/ic_swap.png
new file mode 100644
index 000000000..1b4cffe25
Binary files /dev/null and b/res/drawable-ldpi/ic_swap.png differ
diff --git a/res/drawable-ldpi/nfc_touch.png b/res/drawable-ldpi/nfc_touch.png
new file mode 100644
index 000000000..31cf96164
Binary files /dev/null and b/res/drawable-ldpi/nfc_touch.png differ
diff --git a/res/drawable-ldpi/wifi.png b/res/drawable-ldpi/wifi.png
new file mode 100644
index 000000000..cda16f5a2
Binary files /dev/null and b/res/drawable-ldpi/wifi.png differ
diff --git a/res/drawable-ldpi/wifi_ap_personal.png b/res/drawable-ldpi/wifi_ap_personal.png
new file mode 100644
index 000000000..c05f03c45
Binary files /dev/null and b/res/drawable-ldpi/wifi_ap_personal.png differ
diff --git a/res/drawable-ldpi/wifi_ap_private.png b/res/drawable-ldpi/wifi_ap_private.png
new file mode 100644
index 000000000..33c095ef5
Binary files /dev/null and b/res/drawable-ldpi/wifi_ap_private.png differ
diff --git a/res/drawable-ldpi/wifi_ap_public.png b/res/drawable-ldpi/wifi_ap_public.png
new file mode 100644
index 000000000..a41820a96
Binary files /dev/null and b/res/drawable-ldpi/wifi_ap_public.png differ
diff --git a/res/drawable-mdpi/ic_swap.png b/res/drawable-mdpi/ic_swap.png
new file mode 100644
index 000000000..9f7158f97
Binary files /dev/null and b/res/drawable-mdpi/ic_swap.png differ
diff --git a/res/drawable-mdpi/nfc_touch.png b/res/drawable-mdpi/nfc_touch.png
new file mode 100644
index 000000000..47bd7b941
Binary files /dev/null and b/res/drawable-mdpi/nfc_touch.png differ
diff --git a/res/drawable-mdpi/wifi.png b/res/drawable-mdpi/wifi.png
new file mode 100644
index 000000000..a9906c067
Binary files /dev/null and b/res/drawable-mdpi/wifi.png differ
diff --git a/res/drawable-mdpi/wifi_ap_personal.png b/res/drawable-mdpi/wifi_ap_personal.png
new file mode 100644
index 000000000..98946a705
Binary files /dev/null and b/res/drawable-mdpi/wifi_ap_personal.png differ
diff --git a/res/drawable-mdpi/wifi_ap_private.png b/res/drawable-mdpi/wifi_ap_private.png
new file mode 100644
index 000000000..cb0009279
Binary files /dev/null and b/res/drawable-mdpi/wifi_ap_private.png differ
diff --git a/res/drawable-mdpi/wifi_ap_public.png b/res/drawable-mdpi/wifi_ap_public.png
new file mode 100644
index 000000000..be384b8b8
Binary files /dev/null and b/res/drawable-mdpi/wifi_ap_public.png differ
diff --git a/res/drawable-xhdpi/ic_swap.png b/res/drawable-xhdpi/ic_swap.png
new file mode 100644
index 000000000..c93fc90b5
Binary files /dev/null and b/res/drawable-xhdpi/ic_swap.png differ
diff --git a/res/drawable-xhdpi/nfc_touch.png b/res/drawable-xhdpi/nfc_touch.png
new file mode 100644
index 000000000..6ed6d2cce
Binary files /dev/null and b/res/drawable-xhdpi/nfc_touch.png differ
diff --git a/res/drawable-xhdpi/wifi.png b/res/drawable-xhdpi/wifi.png
new file mode 100644
index 000000000..3bc34fc73
Binary files /dev/null and b/res/drawable-xhdpi/wifi.png differ
diff --git a/res/drawable-xhdpi/wifi_ap_personal.png b/res/drawable-xhdpi/wifi_ap_personal.png
new file mode 100644
index 000000000..ee8fae4da
Binary files /dev/null and b/res/drawable-xhdpi/wifi_ap_personal.png differ
diff --git a/res/drawable-xhdpi/wifi_ap_private.png b/res/drawable-xhdpi/wifi_ap_private.png
new file mode 100644
index 000000000..c39be8d3c
Binary files /dev/null and b/res/drawable-xhdpi/wifi_ap_private.png differ
diff --git a/res/drawable-xhdpi/wifi_ap_public.png b/res/drawable-xhdpi/wifi_ap_public.png
new file mode 100644
index 000000000..56f4c5548
Binary files /dev/null and b/res/drawable-xhdpi/wifi_ap_public.png differ
diff --git a/res/drawable/ic_swap.png b/res/drawable/ic_swap.png
new file mode 100644
index 000000000..030ad9323
Binary files /dev/null and b/res/drawable/ic_swap.png differ
diff --git a/res/drawable/nfc_touch.png b/res/drawable/nfc_touch.png
new file mode 100644
index 000000000..e7a805646
Binary files /dev/null and b/res/drawable/nfc_touch.png differ
diff --git a/res/drawable/swap_action_button_skin.xml b/res/drawable/swap_action_button_skin.xml
new file mode 100644
index 000000000..67faec166
--- /dev/null
+++ b/res/drawable/swap_action_button_skin.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true">
+        <shape>
+            <solid android:color="@color/swap_light_blue_pressed" />
+            <padding
+                android:left="26.9dp"
+                android:top="17.9dp"
+                android:right="26.9dp"
+                android:bottom="17.9dp" />
+                <!--
+                Padding left/right = 48px * 90dpi / 160dpi = ~26.9dp
+                Padding top/bottom = 32px * 90dpi / 160dpi = ~17.9dp
+                -->
+        </shape>
+    </item>
+    <item>
+        <shape>
+            <solid android:color="@color/swap_light_blue" />
+            <padding
+                android:left="26.9dp"
+                android:top="17.9dp"
+                android:right="26.9dp"
+                android:bottom="17.9dp" />
+
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/res/drawable/swap_button_normal.xml b/res/drawable/swap_button_normal.xml
new file mode 100644
index 000000000..c31b230a8
--- /dev/null
+++ b/res/drawable/swap_button_normal.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape>
+            <solid android:color="@color/white" />
+            <padding
+                android:top="1dp"/>
+        </shape>
+    </item>
+    <item>
+        <shape>
+            <solid android:color="@color/swap_blue" />
+            <padding
+                android:left="10dp"
+                android:top="10dp"
+                android:right="10dp"
+                android:bottom="10dp" />
+        </shape>
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/res/drawable/swap_button_pressed.xml b/res/drawable/swap_button_pressed.xml
new file mode 100644
index 000000000..06e7b3b70
--- /dev/null
+++ b/res/drawable/swap_button_pressed.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape>
+            <solid android:color="@color/white" />
+            <padding
+                android:top="1dp"/>
+        </shape>
+    </item>
+    <item>
+        <shape>
+            <solid android:color="@color/swap_blue_pressed" />
+            <padding
+                android:left="10dp"
+                android:top="10dp"
+                android:right="10dp"
+                android:bottom="10dp" />
+        </shape>
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/res/drawable/swap_button_skin.xml b/res/drawable/swap_button_skin.xml
new file mode 100644
index 000000000..c9351791d
--- /dev/null
+++ b/res/drawable/swap_button_skin.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true" android:drawable="@drawable/swap_button_pressed" />
+    <item android:drawable="@drawable/swap_button_normal" />
+</selector>
\ No newline at end of file
diff --git a/res/drawable/swap_nfc_icon.png b/res/drawable/swap_nfc_icon.png
new file mode 100644
index 000000000..800413486
Binary files /dev/null and b/res/drawable/swap_nfc_icon.png differ
diff --git a/res/drawable/swap_qr_example.png b/res/drawable/swap_qr_example.png
new file mode 100644
index 000000000..2719ccb0c
Binary files /dev/null and b/res/drawable/swap_qr_example.png differ
diff --git a/res/drawable/swap_start_button_skin.xml b/res/drawable/swap_start_button_skin.xml
new file mode 100644
index 000000000..b2a71fa84
--- /dev/null
+++ b/res/drawable/swap_start_button_skin.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape>
+            <solid android:color="@color/swap_light_blue" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/res/drawable/swap_wifi_likely_to_work.xml b/res/drawable/swap_wifi_likely_to_work.xml
new file mode 100644
index 000000000..8da6a1a11
--- /dev/null
+++ b/res/drawable/swap_wifi_likely_to_work.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/swap_wifi_likely_to_work" />
+    <size android:width="88dp" android:height="7dp" />
+</shape>
\ No newline at end of file
diff --git a/res/drawable/swap_wifi_may_work.xml b/res/drawable/swap_wifi_may_work.xml
new file mode 100644
index 000000000..af2e1a0a4
--- /dev/null
+++ b/res/drawable/swap_wifi_may_work.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/swap_wifi_may_work"/>
+    <size android:width="88dp" android:height="7dp" />
+</shape>
\ No newline at end of file
diff --git a/res/drawable/swap_window_background.xml b/res/drawable/swap_window_background.xml
new file mode 100644
index 000000000..76f7eb53e
--- /dev/null
+++ b/res/drawable/swap_window_background.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/swap_blue" />
+</shape>
\ No newline at end of file
diff --git a/res/drawable/wifi.png b/res/drawable/wifi.png
new file mode 100644
index 000000000..b7d1da660
Binary files /dev/null and b/res/drawable/wifi.png differ
diff --git a/res/drawable/wifi_ap_personal.png b/res/drawable/wifi_ap_personal.png
new file mode 100644
index 000000000..ee8fae4da
Binary files /dev/null and b/res/drawable/wifi_ap_personal.png differ
diff --git a/res/drawable/wifi_ap_private.png b/res/drawable/wifi_ap_private.png
new file mode 100644
index 000000000..c39be8d3c
Binary files /dev/null and b/res/drawable/wifi_ap_private.png differ
diff --git a/res/drawable/wifi_ap_public.png b/res/drawable/wifi_ap_public.png
new file mode 100644
index 000000000..56f4c5548
Binary files /dev/null and b/res/drawable/wifi_ap_public.png differ
diff --git a/res/layout/applistitem.xml b/res/layout/applistitem.xml
index 8297c1d82..60d635e01 100644
--- a/res/layout/applistitem.xml
+++ b/res/layout/applistitem.xml
@@ -4,7 +4,8 @@
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
 	android:padding="10dp"
-	android:baselineAligned="false" >
+	android:baselineAligned="false"
+	xmlns:tools="http://schemas.android.com/tools" >
 
 	<!-- Actual icon size is dependent on preferences and set in
 		AppListAdapater.java:layoutIcon() -->
@@ -14,7 +15,8 @@
 		android:layout_width="48dip"
 		android:layout_height="48dip"
 		android:layout_gravity="center_vertical"
-		android:scaleType="fitCenter" />
+		android:scaleType="fitCenter"
+		tools:src="@drawable/ic_launcher" />
 
 	<LinearLayout
 		android:orientation="vertical"
@@ -44,7 +46,8 @@
 				android:layout_height="wrap_content"
 				android:layout_gravity="center_vertical"
 				android:gravity="start"
-				android:textAlignment="viewStart" />
+				android:textAlignment="viewStart"
+				tools:text="F-Droid" />
 
 			<TextView android:id="@+id/status"
 				android:textSize="13sp"
@@ -58,6 +61,7 @@
 				android:layout_gravity="center_vertical"
 				android:gravity="end"
 				android:textAlignment="viewEnd"
+				tools:text="Installed"
 				/>
 
 		</LinearLayout>
@@ -79,6 +83,7 @@
 				android:layout_gravity="center_vertical"
 				android:gravity="start"
 				android:textAlignment="viewStart"
+				tools:text="Application manager"
 				/>
 
 			<TextView android:id="@+id/license"
@@ -93,6 +98,7 @@
 				android:layout_gravity="center_vertical"
 				android:gravity="end"
 				android:textAlignment="viewEnd"
+				tools:text="GPLv3"
 				/>
 
 		</LinearLayout>
diff --git a/res/layout/swap_blank.xml b/res/layout/swap_blank.xml
new file mode 100644
index 000000000..83b3d8034
--- /dev/null
+++ b/res/layout/swap_blank.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<RelativeLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+    <TextView
+            android:id="@+id/text_description"
+            android:text="Your mobile device becomes an app store with Swap!"
+            style="@style/SwapTheme.AppList.MainText"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content" />
+
+    <Button
+            android:id="@+id/checkbox_dont_show"
+            android:text="START A SWAP"
+            style="@style/SwapTheme.AppList.StartButton"
+            android:layout_width="match_parent"
+            android:layout_below="@+id/text_description"
+            android:layout_centerHorizontal="true"/>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/swap_create.xml b/res/layout/swap_create.xml
new file mode 100644
index 000000000..d7445db93
--- /dev/null
+++ b/res/layout/swap_create.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<RelativeLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        xmlns:tools="http://schemas.android.com/tools" tools:context=".views.swap.SwapActivity">
+
+    <ListView
+            android:id="@android:id/list"
+            android:layout_height="match_parent"
+            android:layout_width="match_parent"
+            tools:listitem="@layout/applistitem"
+            tools:listheader="@layout/swap_create_header"
+            />
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/swap_create_header.xml b/res/layout/swap_create_header.xml
new file mode 100644
index 000000000..80a20ea2c
--- /dev/null
+++ b/res/layout/swap_create_header.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/text_description"
+        android:text="Tap to select the apps you want to swap."
+        style="@style/SwapTheme.AppList.MainText"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
diff --git a/res/layout/swap_join_wifi.xml b/res/layout/swap_join_wifi.xml
new file mode 100644
index 000000000..1bf1110d8
--- /dev/null
+++ b/res/layout/swap_join_wifi.xml
@@ -0,0 +1,169 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:orientation="vertical"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              xmlns:tools="http://schemas.android.com/tools"
+              tools:context=".views.swap.SwapActivity">
+
+    <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:id="@+id/text_description"
+            android:layout_gravity="center_horizontal"
+            android:layout_alignParentTop="true"
+            android:layout_centerHorizontal="true"
+            style="@style/SwapTheme.Wizard.MainText"
+            android:text="@string/swap_join_same_wifi"/>
+
+    <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:id="@+id/wifi_icon"
+            android:src="@drawable/wifi"
+            android:layout_below="@+id/text_description"
+            android:layout_centerHorizontal="true"
+            android:layout_above="@+id/wifi_ssid"/>
+
+    <Button style="@style/SwapTheme.Wizard.OptionButton"
+            android:id="@+id/btn_bluetooth"
+            android:text="@string/swap_use_bluetooth"
+            android:layout_alignParentBottom="true" />
+
+    <Button style="@style/SwapTheme.Wizard.OptionButton"
+            android:text="@string/swap_wifi_help"
+            android:layout_above="@id/btn_bluetooth"
+            android:id="@+id/btn_learn_more_about_wifi"/>
+
+    <LinearLayout
+            android:id="@+id/wifi_type_descriptions"
+            android:orientation="horizontal"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_above="@id/btn_learn_more_about_wifi"
+            android:layout_centerHorizontal="true"
+            android:gravity="bottom"
+            android:paddingBottom="20dp"
+            android:paddingTop="20dp">
+
+        <LinearLayout
+                android:orientation="vertical"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:layout_marginRight="10dp">
+
+            <ImageView
+                    android:id="@+id/wifi_icon_public"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/wifi_ap_public"/>
+
+            <TextView
+                    android:id="@+id/wifi_label_public"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="Public"/>
+
+            <TextView
+                    android:id="@+id/wifi_warning_public"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="May work"/>
+            
+            <ImageView
+                    android:id="@+id/wifi_status_public"
+                    android:src="@drawable/swap_wifi_may_work"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"/>
+
+        </LinearLayout>
+
+        <LinearLayout
+                android:orientation="vertical"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:layout_marginRight="10dp"
+                android:layout_marginLeft="10dp">
+
+            <ImageView
+                    android:id="@+id/wifi_icon_private"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/wifi_ap_private" />
+
+            <TextView
+                    android:id="@+id/wifi_label_private"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="Private" />
+
+            <TextView
+                    android:id="@+id/wifi_warning_private"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="Promising" />
+            
+            <ImageView
+                    android:id="@+id/wifi_status_private"
+                    android:src="@drawable/swap_wifi_likely_to_work"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content" />
+
+        </LinearLayout>
+
+        <LinearLayout
+                android:orientation="vertical"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:layout_marginLeft="10dp">
+
+            <ImageView
+                    android:id="@+id/wifi_icon_personal"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/wifi_ap_personal" />
+
+            <TextView
+                    android:id="@+id/wifi_label_personal"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="Hotspot" />
+
+            <TextView
+                    android:id="@+id/wifi_warning_personal"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="Best bet" />
+            
+            <ImageView
+                    android:id="@+id/wifi_status_personal"
+                    android:src="@drawable/swap_wifi_likely_to_work"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content" />
+
+        </LinearLayout>
+
+    </LinearLayout>
+
+    <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/swap_view_available_networks"
+            android:id="@+id/wifi_available_networks_prompt"
+            android:layout_above="@id/wifi_type_descriptions"
+            android:layout_centerHorizontal="true" />
+
+    <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            tools:text="No network yet"
+            android:id="@+id/wifi_ssid"
+            style="@style/SwapTheme.Wizard.WifiSSID"
+            android:layout_above="@id/wifi_available_networks_prompt"
+            android:layout_centerHorizontal="true" />
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/swap_nfc.xml b/res/layout/swap_nfc.xml
new file mode 100644
index 000000000..649942af6
--- /dev/null
+++ b/res/layout/swap_nfc.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<RelativeLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        xmlns:tools="http://schemas.android.com/tools"
+        android:paddingTop="38.8dp"> <!-- 69px * 96dpi / 160dpi -->
+
+    <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:id="@+id/icon_nfc"
+            android:src="@drawable/nfc_touch"
+            android:layout_alignParentTop="true"
+            android:layout_centerHorizontal="true"/>
+
+    <TextView
+            android:id="@+id/text_description"
+            android:text="@string/swap_nfc_description"
+            style="@style/SwapTheme.Wizard.MainText"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/icon_nfc" />
+
+    <CheckBox
+            android:id="@+id/checkbox_dont_show"
+            android:text="Don't show this again"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/text_description"
+            android:layout_centerHorizontal="true"/>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/swap_wifi_qr.xml b/res/layout/swap_wifi_qr.xml
new file mode 100644
index 000000000..bbd95fd4f
--- /dev/null
+++ b/res/layout/swap_wifi_qr.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:orientation="vertical"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              xmlns:tools="http://schemas.android.com/tools">
+
+    <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:id="@+id/textView"
+            android:layout_gravity="center_horizontal"
+            android:layout_alignParentTop="true"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentStart="true"
+            tools:text="One person needs to scan the  code, or type the URL of the  other swapper into a browser."
+            style="@style/SwapTheme.Wizard.MainText"/>
+    <ImageView
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:id="@+id/wifi_qr_code"
+            tools:src="@drawable/swap_qr_example"
+            android:layout_below="@+id/textView" android:layout_above="@+id/device_ip_address"/>
+
+    <Button style="@style/SwapTheme.Wizard.OptionButton"
+            android:id="@+id/btn_not_working"
+            android:text="It's not working"
+            android:layout_alignParentBottom="true" />
+
+    <Button style="@style/SwapTheme.Wizard.OptionButton"
+            android:text="Open QR Code Scanner"
+            android:layout_above="@id/btn_not_working" android:layout_gravity="center" android:id="@+id/button"/>
+    <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="New Text"
+            android:id="@+id/device_ip_address"
+            tools:text="192.168.1.1:8888"
+            android:layout_above="@+id/button" android:layout_centerHorizontal="true"
+            style="@style/SwapTheme.Wizard.LocalIpAddress"/>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/res/menu/main.xml b/res/menu/main.xml
index 38e72966e..e768a8152 100644
--- a/res/menu/main.xml
+++ b/res/menu/main.xml
@@ -13,8 +13,8 @@
         android:title="@string/menu_update_repo"
         app:showAsAction="ifRoom"/>
     <item
-        android:id="@+id/action_local_repo"
-        android:title="@string/local_repo"
+        android:id="@+id/action_swap"
+        android:title="@string/swap"
         app:showAsAction="ifRoom"/>
     <item
         android:id="@+id/action_manage_repos"
diff --git a/res/menu/swap.xml b/res/menu/swap.xml
new file mode 100644
index 000000000..25ce5bc0a
--- /dev/null
+++ b/res/menu/swap.xml
@@ -0,0 +1,11 @@
+<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <item
+        android:id="@+id/action_next"
+        android:title="Next"
+        android:titleCondensed="Next"/>
+
+    <!-- Currently in a style, but that style probably wont work on 8 -> 11 devices -->
+    <!--android:drawable="@drawable/swap_action_button_skin"-->
+
+</menu>
\ No newline at end of file
diff --git a/res/values/colors.xml b/res/values/colors.xml
index d2777848b..cd2091ecf 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -3,4 +3,12 @@
     <color name="signed">#ffcccccc</color>
     <color name="unsigned">#ffCC0000</color>
     <color name="unverified">#ff999999</color>
+
+    <color name="swap_light_blue">#27aae1</color>
+    <color name="swap_light_blue_pressed">#ff98cce1</color>
+    <color name="swap_blue">#1c6bbc</color>
+    <color name="swap_blue_pressed">#ff6ca8d5</color>
+    <color name="swap_wifi_may_work">#fbb040</color>
+    <color name="swap_wifi_likely_to_work">#00a14b</color>
+
 </resources>
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 25c1d3af4..3288c93b6 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -295,4 +295,12 @@
     <string name="system_permission_denied_body">This option is only available when F-Droid is installed as a system-app.</string>
 
     <string name="app_description">F-Droid is an installable catalogue of FOSS (Free and Open Source Software) applications for the Android platform. The client makes it easy to browse, install, and keep track of updates on your device.</string>
+    <string name="swap_nfc_description">If your friend has <b>F-Droid and NFC turned on</b> touch your phones together.</string>
+    <string name="swap_join_same_wifi">Join the same Wifi as your friend</string>
+    <string name="swap_use_bluetooth">Use Bluetooth instead</string>
+    <string name="swap_wifi_help">Learn more about Wifi</string>
+    <string name="menu_swap">Swap apps</string>
+    <string name="swap">Swap apps</string>
+    <string name="swap_no_wifi_network">No network yet</string>
+    <string name="swap_view_available_networks">(Tap to open available networks)</string>
 </resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index dfd911baa..9f319b9ba 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -33,4 +33,93 @@
         <!-- customizations that are not API-level specific go here. -->
     </style>
 
+    <style name="SwapTheme.Wizard" parent="AppThemeDark">
+        <item name="android:windowBackground">@drawable/swap_window_background</item>
+        <item name="android:actionBarStyle">@style/Widget.AppCompat.ActionBar.Solid</item>
+        <item name="android:actionButtonStyle">@style/SwapTheme.Wizard.ActionButton</item>
+    </style>
+
+    <style name="SwapTheme.AppList" parent="AppThemeLightWithDarkActionBar">
+    </style>
+
+    <style name="SwapTheme.AppList.StartButton">
+        <item name="android:layout_marginLeft">9dp</item> <!-- 16px * 96dpi / 160dpi -->
+        <item name="android:layout_marginRight">9dp</item> <!-- 16px * 96dpi / 160dpi -->
+        <item name="android:layout_height">63.3dp</item> <!-- 113px * 96dpi / 160dpi -->
+        <item name="android:layout_width">match_parent</item>
+
+        <item name="android:textSize">18.5sp</item> <!-- 33px * 96dpi / 160dpi -->
+        <item name="android:background">@drawable/swap_start_button_skin</item>
+        <item name="android:textColor">#fff</item>
+        <item name="android:drawableLeft">@drawable/ic_swap</item>
+        <item name="android:paddingLeft">10dp</item>
+
+    </style>
+
+    <style name="SwapTheme.AppList.MainText">
+        <item name="android:textAlignment">center</item>
+        <item name="android:textSize">20.1sp</item> <!-- 36px * 96dpi / 160dpi -->
+        <item name="android:paddingLeft">28dp</item> <!-- 50px * 96dpi / 160dpi -->
+        <item name="android:paddingRight">28dp</item> <!-- 50px * 96dpi / 160dpi -->
+        <item name="android:paddingTop">28dp</item> <!-- 50px * 96dpi / 160dpi -->
+        <item name="android:paddingBottom">16.8dp</item> <!-- 30px * 96dpi / 160dpi -->
+    </style>
+
+    <style name="SwapTheme.Wizard.Text">
+        <item name="android:textAlignment">center</item>
+        <item name="android:textColor">#fff</item>
+        <item name="android:textColorPrimary">#fff</item>
+        <item name="android:textColorSecondary">#fff</item>
+    </style>
+
+    <style name="SwapTheme.Wizard.ActionButton" parent="Widget.AppCompat.ActionButton">
+        <item name="android:textAppearance">@style/SwapTheme.Wizard.Text</item>
+        <item name="android:paddingLeft">10dp</item>
+        <item name="android:paddingRight">10dp</item>
+        <item name="android:paddingTop">5dp</item>
+        <item name="android:paddingBottom">5dp</item>
+        <item name="android:background">@drawable/swap_action_button_skin</item>
+    </style>
+
+    <style name="SwapTheme.Wizard.MainText" parent="@style/SwapTheme.Wizard.Text">
+        <item name="android:paddingLeft">40dp</item>
+        <item name="android:paddingRight">40dp</item>
+        <item name="android:paddingTop">39.3dp</item> <!-- 70px * 96dpi / 160dpi -->
+        <item name="android:paddingBottom">29.25dp</item> <!-- 52px * 96dpi / 160dpi -->
+        <item name="android:fontFamily">sans-serif-light</item>
+    </style>
+
+    <style name="SwapTheme.Wizard.LocalIpAddress" parent="@style/SwapTheme.Wizard.Text">
+        <item name="android:textSize">32.5sp</item> <!-- 58px * 96dpi / 160dpi -->
+        <item name="android:paddingLeft">40dp</item>
+        <item name="android:paddingRight">40dp</item>
+        <item name="android:paddingTop">22.5dp</item> <!-- 40px * 96dpi / 160dpi -->
+        <item name="android:paddingBottom">42.5dp</item> <!-- 75px * 96dpi / 160dpi -->
+        <item name="android:textStyle">bold</item>
+    </style>
+
+    <style name="SwapTheme.Wizard.WifiSSID" parent="@style/SwapTheme.Wizard.Text">
+        <item name="android:textSize">26sp</item> <!-- 46px * 96dpi / 160dpi -->
+        <item name="android:paddingLeft">40dp</item>
+        <item name="android:paddingRight">40dp</item>
+        <item name="android:paddingTop">20dp</item>
+        <item name="android:paddingBottom">5dp</item>
+        <item name="android:textStyle">bold</item>
+    </style>
+
+    <!--
+    Buttons down the bottom of the screen, which prompt the user for further
+    info, or to change the process somehow (e.g. Use Bluetooth instead of Wifi).
+    -->
+    <style name="SwapTheme.Wizard.OptionButton">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:padding">19dp</item> <!-- 34px * 96dpi / 160dpi -->
+        <item name="android:textSize">20.25sp</item> <!-- 36px * 96dpi / 160dpi -->
+        <item name="android:background">@drawable/swap_button_skin</item>
+        <item name="android:textColor">#fff</item>
+        <item name="android:fontFamily">sans-serif-light</item>
+        <item name="android:layout_margin">0dp</item>
+    </style>
+
 </resources>
diff --git a/src/org/fdroid/fdroid/FDroid.java b/src/org/fdroid/fdroid/FDroid.java
index 18d610e52..0cc798535 100644
--- a/src/org/fdroid/fdroid/FDroid.java
+++ b/src/org/fdroid/fdroid/FDroid.java
@@ -47,6 +47,7 @@ import org.fdroid.fdroid.data.AppProvider;
 import org.fdroid.fdroid.views.AppListFragmentPagerAdapter;
 import org.fdroid.fdroid.views.LocalRepoActivity;
 import org.fdroid.fdroid.views.ManageReposActivity;
+import org.fdroid.fdroid.views.swap.SwapActivity;
 
 public class FDroid extends ActionBarActivity {
 
@@ -145,8 +146,12 @@ public class FDroid extends ActionBarActivity {
                 startActivityForResult(prefs, REQUEST_PREFS);
                 return true;
 
-            case R.id.action_local_repo:
-                startActivity(new Intent(this, LocalRepoActivity.class));
+            case R.id.action_swap:
+                startActivity(new Intent(this, SwapActivity.class));
+                return true;
+
+            case R.id.action_swap:
+                startActivity(new Intent(this, SwapActivity.class));
                 return true;
 
             case R.id.action_search:
diff --git a/src/org/fdroid/fdroid/views/swap/JoinWifiFragment.java b/src/org/fdroid/fdroid/views/swap/JoinWifiFragment.java
new file mode 100644
index 000000000..6104de83b
--- /dev/null
+++ b/src/org/fdroid/fdroid/views/swap/JoinWifiFragment.java
@@ -0,0 +1,64 @@
+package org.fdroid.fdroid.views.swap;
+
+import android.app.Activity;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.support.v4.content.LocalBroadcastManager;
+import android.text.TextUtils;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+import android.widget.Toast;
+import org.fdroid.fdroid.FDroidApp;
+import org.fdroid.fdroid.R;
+import org.fdroid.fdroid.net.WifiStateChangeService;
+
+public class JoinWifiFragment extends Fragment {
+
+    private BroadcastReceiver onWifiChange = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            refreshWifiState();
+        }
+    };
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        View joinWifiView = inflater.inflate(R.layout.swap_join_wifi, container, false);
+        joinWifiView.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Toast.makeText(getActivity(), "Touched view", Toast.LENGTH_LONG);
+            }
+        });
+        return joinWifiView;
+    }
+
+    @Override
+    public void onAttach(Activity activity) {
+        super.onAttach(activity);
+        // TODO: Listen for "Connecting..." state and reflect that in the view too.
+        LocalBroadcastManager.getInstance(activity).registerReceiver(
+                onWifiChange,
+                new IntentFilter(WifiStateChangeService.BROADCAST));
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        refreshWifiState();
+    }
+
+    private void refreshWifiState() {
+        if (getView() != null) {
+            TextView ssidView = (TextView) getView().findViewById(R.id.wifi_ssid);
+            String text = TextUtils.isEmpty(FDroidApp.ssid) ? getString(R.string.swap_no_wifi_network) : FDroidApp.ssid;
+            ssidView.setText(text);
+        }
+    }
+}
diff --git a/src/org/fdroid/fdroid/views/swap/NfcSwapFragment.java b/src/org/fdroid/fdroid/views/swap/NfcSwapFragment.java
new file mode 100644
index 000000000..9ee92f6f2
--- /dev/null
+++ b/src/org/fdroid/fdroid/views/swap/NfcSwapFragment.java
@@ -0,0 +1,17 @@
+package org.fdroid.fdroid.views.swap;
+
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import org.fdroid.fdroid.R;
+
+public class NfcSwapFragment extends Fragment {
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        return inflater.inflate(R.layout.swap_nfc, container, false);
+    }
+
+}
diff --git a/src/org/fdroid/fdroid/views/swap/SwapActivity.java b/src/org/fdroid/fdroid/views/swap/SwapActivity.java
new file mode 100644
index 000000000..bdaa92970
--- /dev/null
+++ b/src/org/fdroid/fdroid/views/swap/SwapActivity.java
@@ -0,0 +1,96 @@
+package org.fdroid.fdroid.views.swap;
+
+import android.os.Bundle;
+import android.support.v4.app.FragmentManager;
+import android.support.v4.view.MenuItemCompat;
+import android.support.v7.app.ActionBarActivity;
+import android.view.Menu;
+import android.view.MenuItem;
+import org.fdroid.fdroid.R;
+
+public class SwapActivity extends ActionBarActivity implements SwapProcessManager {
+
+    private static final String STATE_JOIN_WIFI = "joinWifi";
+    private static final String STATE_NFC = "nfc";
+    private static final String STATE_WIFI_QR = "wifiQr";
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.swap, menu);
+        MenuItem next = menu.getItem(0);
+        MenuItemCompat.setShowAsAction(next, MenuItemCompat.SHOW_AS_ACTION_ALWAYS | MenuItemCompat.SHOW_AS_ACTION_WITH_TEXT);
+        return true;
+    }
+
+    @Override
+    public boolean onPrepareOptionsMenu(Menu menu) {
+        return super.onPrepareOptionsMenu(menu);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (item.getItemId() == R.id.action_next) {
+            moveToNext();
+            return true;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
+    private void moveToNext() {
+        getSupportFragmentManager().popBackStack();
+        FragmentManager.BackStackEntry lastFragment = getSupportFragmentManager().getBackStackEntryAt(getSupportFragmentManager().getBackStackEntryCount() - 1);
+        String name = lastFragment.getName();
+        switch (name) {
+            case STATE_JOIN_WIFI:
+                onAttemptNfc();
+                break;
+            case STATE_NFC:
+                onWifiQr();
+                break;
+            case STATE_WIFI_QR:
+
+                break;
+        }
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+
+        super.onCreate(savedInstanceState);
+
+        if (savedInstanceState == null) {
+
+            getSupportFragmentManager()
+                    .beginTransaction()
+                    .add(android.R.id.content, new JoinWifiFragment(), STATE_JOIN_WIFI)
+                    .addToBackStack(STATE_JOIN_WIFI)
+                    .commit();
+
+        }
+
+    }
+
+    @Override
+    public void onAttemptNfc() {
+        getSupportFragmentManager()
+                .beginTransaction()
+                .addToBackStack(STATE_NFC)
+                .replace(android.R.id.content, new NfcSwapFragment(), STATE_NFC)
+                .commit();
+    }
+
+    @Override
+    public void onBluetooth() {
+
+    }
+
+    @Override
+    public void onWifiQr() {
+        getSupportFragmentManager()
+                .beginTransaction()
+                .addToBackStack(STATE_WIFI_QR)
+                .replace(android.R.id.content, new WifiQrFragment(), STATE_WIFI_QR)
+                .commit();
+    }
+
+}
diff --git a/src/org/fdroid/fdroid/views/swap/SwapProcessManager.java b/src/org/fdroid/fdroid/views/swap/SwapProcessManager.java
new file mode 100644
index 000000000..33161ca47
--- /dev/null
+++ b/src/org/fdroid/fdroid/views/swap/SwapProcessManager.java
@@ -0,0 +1,7 @@
+package org.fdroid.fdroid.views.swap;
+
+public interface SwapProcessManager {
+    public void onAttemptNfc();
+    public void onBluetooth();
+    public void onWifiQr();
+}
diff --git a/src/org/fdroid/fdroid/views/swap/WifiQrFragment.java b/src/org/fdroid/fdroid/views/swap/WifiQrFragment.java
new file mode 100644
index 000000000..2d8d29212
--- /dev/null
+++ b/src/org/fdroid/fdroid/views/swap/WifiQrFragment.java
@@ -0,0 +1,17 @@
+package org.fdroid.fdroid.views.swap;
+
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import org.fdroid.fdroid.R;
+
+public class WifiQrFragment extends Fragment {
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        return inflater.inflate(R.layout.swap_nfc, container, false);
+    }
+
+}