diff --git a/F-Droid/res/drawable-hdpi/ic_fdroid_grey.png b/F-Droid/res/drawable-hdpi/ic_fdroid_grey.png
new file mode 100644
index 000000000..96d140510
Binary files /dev/null and b/F-Droid/res/drawable-hdpi/ic_fdroid_grey.png differ
diff --git a/F-Droid/res/drawable-hdpi/ic_qr_grey.png b/F-Droid/res/drawable-hdpi/ic_qr_grey.png
new file mode 100644
index 000000000..fcd140afc
Binary files /dev/null and b/F-Droid/res/drawable-hdpi/ic_qr_grey.png differ
diff --git a/F-Droid/res/drawable-hdpi/swap_start_header.png b/F-Droid/res/drawable-hdpi/swap_start_header.png
new file mode 100644
index 000000000..2e506e1c9
Binary files /dev/null and b/F-Droid/res/drawable-hdpi/swap_start_header.png differ
diff --git a/F-Droid/res/drawable-ldpi/ic_fdroid_grey.png b/F-Droid/res/drawable-ldpi/ic_fdroid_grey.png
new file mode 100644
index 000000000..7ef8e32bb
Binary files /dev/null and b/F-Droid/res/drawable-ldpi/ic_fdroid_grey.png differ
diff --git a/F-Droid/res/drawable-ldpi/ic_qr_grey.png b/F-Droid/res/drawable-ldpi/ic_qr_grey.png
new file mode 100644
index 000000000..0b1f160f1
Binary files /dev/null and b/F-Droid/res/drawable-ldpi/ic_qr_grey.png differ
diff --git a/F-Droid/res/drawable-ldpi/swap_start_header.png b/F-Droid/res/drawable-ldpi/swap_start_header.png
new file mode 100644
index 000000000..505ede173
Binary files /dev/null and b/F-Droid/res/drawable-ldpi/swap_start_header.png differ
diff --git a/F-Droid/res/drawable-mdpi/ic_fdroid_grey.png b/F-Droid/res/drawable-mdpi/ic_fdroid_grey.png
new file mode 100644
index 000000000..c14a7bd44
Binary files /dev/null and b/F-Droid/res/drawable-mdpi/ic_fdroid_grey.png differ
diff --git a/F-Droid/res/drawable-mdpi/ic_qr_grey.png b/F-Droid/res/drawable-mdpi/ic_qr_grey.png
new file mode 100644
index 000000000..8bca1d39d
Binary files /dev/null and b/F-Droid/res/drawable-mdpi/ic_qr_grey.png differ
diff --git a/F-Droid/res/drawable-mdpi/swap_start_header.png b/F-Droid/res/drawable-mdpi/swap_start_header.png
new file mode 100644
index 000000000..3f5b7eaf3
Binary files /dev/null and b/F-Droid/res/drawable-mdpi/swap_start_header.png differ
diff --git a/F-Droid/res/drawable-xhdpi/ic_fdroid_grey.png b/F-Droid/res/drawable-xhdpi/ic_fdroid_grey.png
new file mode 100644
index 000000000..5d32c2c77
Binary files /dev/null and b/F-Droid/res/drawable-xhdpi/ic_fdroid_grey.png differ
diff --git a/F-Droid/res/drawable-xhdpi/ic_qr_grey.png b/F-Droid/res/drawable-xhdpi/ic_qr_grey.png
new file mode 100644
index 000000000..fd2b7cd3f
Binary files /dev/null and b/F-Droid/res/drawable-xhdpi/ic_qr_grey.png differ
diff --git a/F-Droid/res/drawable-xhdpi/swap_start_header.png b/F-Droid/res/drawable-xhdpi/swap_start_header.png
new file mode 100644
index 000000000..9670f22d3
Binary files /dev/null and b/F-Droid/res/drawable-xhdpi/swap_start_header.png differ
diff --git a/F-Droid/res/drawable-xxhdpi/ic_fdroid_grey.png b/F-Droid/res/drawable-xxhdpi/ic_fdroid_grey.png
new file mode 100644
index 000000000..89a0602f4
Binary files /dev/null and b/F-Droid/res/drawable-xxhdpi/ic_fdroid_grey.png differ
diff --git a/F-Droid/res/drawable-xxhdpi/ic_qr_grey.png b/F-Droid/res/drawable-xxhdpi/ic_qr_grey.png
new file mode 100644
index 000000000..2a830f06a
Binary files /dev/null and b/F-Droid/res/drawable-xxhdpi/ic_qr_grey.png differ
diff --git a/F-Droid/res/drawable-xxhdpi/swap_start_header.png b/F-Droid/res/drawable-xxhdpi/swap_start_header.png
new file mode 100644
index 000000000..dc7e4b278
Binary files /dev/null and b/F-Droid/res/drawable-xxhdpi/swap_start_header.png differ
diff --git a/F-Droid/res/drawable-xxxhdpi/ic_fdroid_grey.png b/F-Droid/res/drawable-xxxhdpi/ic_fdroid_grey.png
new file mode 100644
index 000000000..eeac0dcb9
Binary files /dev/null and b/F-Droid/res/drawable-xxxhdpi/ic_fdroid_grey.png differ
diff --git a/F-Droid/res/drawable-xxxhdpi/ic_qr_grey.png b/F-Droid/res/drawable-xxxhdpi/ic_qr_grey.png
new file mode 100644
index 000000000..83e95d316
Binary files /dev/null and b/F-Droid/res/drawable-xxxhdpi/ic_qr_grey.png differ
diff --git a/F-Droid/res/drawable-xxxhdpi/swap_start_header.png b/F-Droid/res/drawable-xxxhdpi/swap_start_header.png
new file mode 100644
index 000000000..86c4f719f
Binary files /dev/null and b/F-Droid/res/drawable-xxxhdpi/swap_start_header.png differ
diff --git a/F-Droid/res/drawable/ic_fdroid_grey.png b/F-Droid/res/drawable/ic_fdroid_grey.png
new file mode 100644
index 000000000..b891fc06e
Binary files /dev/null and b/F-Droid/res/drawable/ic_fdroid_grey.png differ
diff --git a/F-Droid/res/drawable/ic_qr_grey.png b/F-Droid/res/drawable/ic_qr_grey.png
new file mode 100644
index 000000000..098b1ff7c
Binary files /dev/null and b/F-Droid/res/drawable/ic_qr_grey.png differ
diff --git a/F-Droid/res/drawable/swap_start_header.png b/F-Droid/res/drawable/swap_start_header.png
new file mode 100644
index 000000000..46c11f297
Binary files /dev/null and b/F-Droid/res/drawable/swap_start_header.png differ
diff --git a/F-Droid/res/layout/swap_blank.xml b/F-Droid/res/layout/swap_blank.xml
index 5113fbf6b..9f6ee9df9 100644
--- a/F-Droid/res/layout/swap_blank.xml
+++ b/F-Droid/res/layout/swap_blank.xml
@@ -10,12 +10,13 @@
     <RelativeLayout
         android:id="@+id/header"
         android:layout_width="match_parent"
-        android:layout_height="120dp">
+        android:layout_height="130dp">
 
         <ImageView
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            />
+            android:scaleType="centerCrop"
+            android:src="@drawable/swap_start_header"/>
 
         <ImageView
             android:layout_width="24dp"
@@ -36,7 +37,8 @@
             android:paddingStart="30dp"
             android:paddingEnd="30dp"
             android:textAlignment="center"
-            tools:text="Connect and trade apps with people near you."
+            android:text="@string/swap_intro"
+            android:textColor="@color/white"
             android:textSize="18sp" />
 
     </RelativeLayout>
@@ -51,13 +53,14 @@
         <ImageView
             android:layout_width="24dp"
             android:layout_height="24dp"
-            tools:src="@drawable/ic_bluetooth_white" />
+            android:tint="@color/swap_grey_icon"
+            android:src="@drawable/ic_bluetooth_white" />
 
         <TextView
             android:paddingStart="15dp"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            tools:text="Visible via Bluetooth"
+            android:text="@string/swap_visible_bluetooth"
             android:textSize="18sp" />
 
         <TextView
@@ -65,6 +68,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             tools:text="SP-120"
+            android:textColor="@color/swap_light_text"
             android:layout_weight="1.00"
             android:paddingStart="10dp"
             android:paddingEnd="10dp" />
@@ -85,7 +89,8 @@
         <ImageView
             android:layout_width="24dp"
             android:layout_height="24dp"
-            tools:src="@drawable/ic_network_wifi_white" />
+            android:tint="@color/swap_grey_icon"
+            android:src="@drawable/ic_network_wifi_white" />
 
         <LinearLayout
             android:paddingStart="15dp"
@@ -96,21 +101,23 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                tools:text="Not visible via WiFi"
+                android:text="@string/swap_not_visible_wifi"
                 android:textSize="18sp" />
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 tools:text="wifi network name"
+                android:textColor="@color/swap_light_text"
                 android:textSize="16sp" />
 
         </LinearLayout>
 
         <TextView
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            tools:text="Device Name"
+            android:text="@string/swap_wifi_device_name"
+            android:textColor="@color/swap_light_text"
             android:layout_weight="1.00"
             android:paddingStart="10dp"
             android:paddingEnd="10dp" />
@@ -125,15 +132,16 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:paddingStart="15dp"
-        android:paddingEnd="15dp"
-        android:paddingBottom="15dp"
-        android:paddingTop="35dp">
+        android:paddingStart="20dp"
+        android:paddingEnd="20dp"
+        android:paddingBottom="5dp"
+        android:paddingTop="20dp">
 
         <TextView
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            tools:text="People Nearby"
+            android:text="@string/swap_people_nearby"
+            android:textColor="@color/swap_light_text"
             android:layout_weight="1.00"/>
 
         <ProgressBar
@@ -143,10 +151,28 @@
 
     </LinearLayout>
 
+    <TextView
+        android:id="@+id/no_people_nearby"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:padding="20dp"
+        android:textStyle="italic"
+        android:textColor="@color/swap_light_text"
+        android:text="@string/swap_no_peers_nearby"/>
+
+    <ListView
+        android:id="@+id/list_people_nearby"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+    </ListView>
+
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        tools:text="Can't find who you're looking for?" />
+        android:text="@string/swap_cant_find_peers"
+        android:paddingStart="20dp"
+        android:textColor="@color/swap_light_text" />
 
     <LinearLayout
         android:orientation="horizontal"
@@ -157,16 +183,22 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_weight="1.00"
-            android:drawableStart="@drawable/ic_launcher"
-            tools:text="SEND F-DROID"
+            android:drawableStart="@drawable/ic_fdroid_grey"
+            android:drawablePadding="10dp"
+            android:paddingStart="20dp"
+            android:background="@android:color/transparent"
+            android:text="@string/swap_send_fdroid"
             android:gravity="start|center_vertical" />
 
         <Button
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_weight="1.00"
-            android:drawableStart="@drawable/ic_launcher"
-            tools:text="SCAN QR CODE"
+            android:drawableStart="@drawable/ic_qr_grey"
+            android:drawablePadding="10dp"
+            android:paddingStart="20dp"
+            android:background="@android:color/transparent"
+            android:text="@string/swap_scan_qr"
             android:gravity="start|center_vertical" />
 
     </LinearLayout>
diff --git a/F-Droid/res/values/colors.xml b/F-Droid/res/values/colors.xml
index 6f47493c9..5bc4e07e5 100644
--- a/F-Droid/res/values/colors.xml
+++ b/F-Droid/res/values/colors.xml
@@ -19,5 +19,7 @@
     <color name="swap_wifi_may_work">#fbb040</color>
     <color name="swap_wifi_likely_to_work">#00a14b</color>
     <color name="swap_bright_blue">#00b9e6</color>
+    <color name="swap_light_text">#bbbbbb</color>
+    <color name="swap_grey_icon">#4a4a4a</color>
 
 </resources>
\ No newline at end of file
diff --git a/F-Droid/res/values/strings.xml b/F-Droid/res/values/strings.xml
index 6cbf676e7..75fb2cb77 100644
--- a/F-Droid/res/values/strings.xml
+++ b/F-Droid/res/values/strings.xml
@@ -332,4 +332,12 @@
 	<string name="swap_choose_apps">Choose Apps</string>
 	<string name="swap_scan_qr">Scan QR Code</string>
 	<string name="swap_nearby">Nearby Swap</string>
+	<string name="swap_intro">Connect and trade apps with people near you.</string>
+	<string name="swap_visible_bluetooth">Visible via Bluetooth</string>
+	<string name="swap_not_visible_wifi">Not visible via WiFi</string>
+	<string name="swap_wifi_device_name">Device Name</string>
+	<string name="swap_people_nearby">People Nearby</string>
+	<string name="swap_cant_find_peers">Can\'t find who you\'re looking for?</string>
+	<string name="swap_send_fdroid">SEND F-DROID</string>
+	<string name="swap_no_peers_nearby">Could not find people nearby to swap with.</string>
 </resources>
diff --git a/F-Droid/src/org/fdroid/fdroid/views/swap/StartSwapView.java b/F-Droid/src/org/fdroid/fdroid/views/swap/StartSwapView.java
index f9f9c50aa..e14ec3622 100644
--- a/F-Droid/src/org/fdroid/fdroid/views/swap/StartSwapView.java
+++ b/F-Droid/src/org/fdroid/fdroid/views/swap/StartSwapView.java
@@ -14,6 +14,7 @@ import android.view.MenuInflater;
 import android.view.View;
 import android.widget.CompoundButton;
 import android.widget.LinearLayout;
+import android.widget.ListView;
 import android.widget.Switch;
 import android.widget.TextView;
 
@@ -60,11 +61,17 @@ public class StartSwapView extends LinearLayout implements SwapWorkflowActivity.
     private final BluetoothAdapter bluetooth = BluetoothAdapter.getDefaultAdapter();
 
     private TextView viewBluetoothId;
+    private View noPeopleNearby;
+    private ListView peopleNearby;
 
     @Override
     protected void onFinishInflate() {
         super.onFinishInflate();
 
+        noPeopleNearby = findViewById(R.id.no_people_nearby);
+        peopleNearby = (ListView)findViewById(R.id.list_people_nearby);
+        peopleNearby.setVisibility(View.GONE);
+
         if (bluetooth != null) {
 
             viewBluetoothId = (TextView)findViewById(R.id.device_id_bluetooth);