diff --git a/F-Droid/res/layout/swap_connecting.xml b/F-Droid/res/layout/swap_connecting.xml
index 62671c0c5..f7cea9d89 100644
--- a/F-Droid/res/layout/swap_connecting.xml
+++ b/F-Droid/res/layout/swap_connecting.xml
@@ -25,7 +25,7 @@
             android:layout_gravity="center" />
 
         <TextView
-            android:layout_width="wrap_content"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:id="@+id/error"
             android:textSize="20sp"
diff --git a/F-Droid/src/org/fdroid/fdroid/UpdateService.java b/F-Droid/src/org/fdroid/fdroid/UpdateService.java
index 3e75ff7db..db028835e 100644
--- a/F-Droid/src/org/fdroid/fdroid/UpdateService.java
+++ b/F-Droid/src/org/fdroid/fdroid/UpdateService.java
@@ -160,6 +160,13 @@ public class UpdateService extends IntentService implements ProgressListener {
                 .setOngoing(true)
                 .setCategory(NotificationCompat.CATEGORY_SERVICE)
                 .setContentTitle(getString(R.string.update_notification_title));
+
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN) {
+            Intent intent = new Intent(this, FDroid.class);
+            // TODO: Is this the correct FLAG?
+            notificationBuilder.setContentIntent(PendingIntent.getActivity(this, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT));
+        }
+
         notificationManager.notify(NOTIFY_ID_UPDATING, notificationBuilder.build());
     }
 
diff --git a/F-Droid/src/org/fdroid/fdroid/localrepo/SwapService.java b/F-Droid/src/org/fdroid/fdroid/localrepo/SwapService.java
index 09f8bd673..ec597f0cb 100644
--- a/F-Droid/src/org/fdroid/fdroid/localrepo/SwapService.java
+++ b/F-Droid/src/org/fdroid/fdroid/localrepo/SwapService.java
@@ -68,6 +68,9 @@ import java.util.TimerTask;
  * TODO: Turn off bluetooth after cancelling/timing out if we turned it on.
  * TODO: Disable the Scan QR button unless visible via something. Could equally show relevant feedback.
  *
+ * TODO: Starting wifi after cancelling swap and beginning again doesn't work properly
+ * TODO: Scan QR hangs when updating repoo
+ *
  */
 public class SwapService extends Service {
 
diff --git a/F-Droid/src/org/fdroid/fdroid/views/swap/ConfirmReceive.java b/F-Droid/src/org/fdroid/fdroid/views/swap/ConfirmReceive.java
index 84f981ca9..bfbab9b4c 100644
--- a/F-Droid/src/org/fdroid/fdroid/views/swap/ConfirmReceive.java
+++ b/F-Droid/src/org/fdroid/fdroid/views/swap/ConfirmReceive.java
@@ -77,7 +77,7 @@ public class ConfirmReceive extends RelativeLayout implements SwapWorkflowActivi
 
     @ColorRes
     public int getToolbarColour() {
-        return getResources().getColor(R.color.swap_blue);
+        return R.color.swap_blue;
     }
 
     @Override
diff --git a/F-Droid/src/org/fdroid/fdroid/views/swap/InitialLoadingView.java b/F-Droid/src/org/fdroid/fdroid/views/swap/InitialLoadingView.java
index d3be23001..26f62680a 100644
--- a/F-Droid/src/org/fdroid/fdroid/views/swap/InitialLoadingView.java
+++ b/F-Droid/src/org/fdroid/fdroid/views/swap/InitialLoadingView.java
@@ -58,7 +58,7 @@ public class InitialLoadingView extends RelativeLayout implements SwapWorkflowAc
 
     @ColorRes
     public int getToolbarColour() {
-        return getResources().getColor(R.color.swap_blue);
+        return R.color.swap_blue;
     }
 
     @Override
diff --git a/F-Droid/src/org/fdroid/fdroid/views/swap/JoinWifiView.java b/F-Droid/src/org/fdroid/fdroid/views/swap/JoinWifiView.java
index 2354e65f0..118eccdf6 100644
--- a/F-Droid/src/org/fdroid/fdroid/views/swap/JoinWifiView.java
+++ b/F-Droid/src/org/fdroid/fdroid/views/swap/JoinWifiView.java
@@ -132,7 +132,7 @@ public class JoinWifiView extends RelativeLayout implements SwapWorkflowActivity
 
     @ColorRes
     public int getToolbarColour() {
-        return getResources().getColor(R.color.swap_blue);
+        return R.color.swap_blue;
     }
 
     @Override
diff --git a/F-Droid/src/org/fdroid/fdroid/views/swap/NfcView.java b/F-Droid/src/org/fdroid/fdroid/views/swap/NfcView.java
index d5bd3d251..930de1907 100644
--- a/F-Droid/src/org/fdroid/fdroid/views/swap/NfcView.java
+++ b/F-Droid/src/org/fdroid/fdroid/views/swap/NfcView.java
@@ -80,7 +80,7 @@ public class NfcView extends RelativeLayout implements SwapWorkflowActivity.Inne
 
     @ColorRes
     public int getToolbarColour() {
-        return getResources().getColor(R.color.swap_blue);
+        return R.color.swap_blue;
     }
 
     @Override
diff --git a/F-Droid/src/org/fdroid/fdroid/views/swap/SelectAppsView.java b/F-Droid/src/org/fdroid/fdroid/views/swap/SelectAppsView.java
index f6750e936..ae6c0d4fa 100644
--- a/F-Droid/src/org/fdroid/fdroid/views/swap/SelectAppsView.java
+++ b/F-Droid/src/org/fdroid/fdroid/views/swap/SelectAppsView.java
@@ -124,12 +124,13 @@ public class SelectAppsView extends ListView implements
 
     @Override
     public int getPreviousStep() {
+        // TODO: The STEP_JOIN_WIFI step isn't shown first, need to make it so that it is, or so that this doesn't go back there.
         return getState().isConnectingWithPeer() ? SwapService.STEP_INTRO : SwapService.STEP_JOIN_WIFI;
     }
 
     @ColorRes
     public int getToolbarColour() {
-        return getResources().getColor(R.color.swap_bright_blue);
+        return R.color.swap_bright_blue;
     }
 
     @Override
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 3a575ac61..bf2ae9663 100644
--- a/F-Droid/src/org/fdroid/fdroid/views/swap/StartSwapView.java
+++ b/F-Droid/src/org/fdroid/fdroid/views/swap/StartSwapView.java
@@ -356,7 +356,7 @@ public class StartSwapView extends ScrollView implements SwapWorkflowActivity.In
     @Override
     @ColorRes
     public int getToolbarColour() {
-        return getResources().getColor(R.color.swap_bright_blue);
+        return R.color.swap_bright_blue;
     }
 
     @Override
diff --git a/F-Droid/src/org/fdroid/fdroid/views/swap/SwapConnecting.java b/F-Droid/src/org/fdroid/fdroid/views/swap/SwapConnecting.java
index 05c4a0a4d..2df1356a6 100644
--- a/F-Droid/src/org/fdroid/fdroid/views/swap/SwapConnecting.java
+++ b/F-Droid/src/org/fdroid/fdroid/views/swap/SwapConnecting.java
@@ -148,7 +148,7 @@ public class SwapConnecting extends LinearLayout implements SwapWorkflowActivity
 
     @ColorRes
     public int getToolbarColour() {
-        return getResources().getColor(R.color.swap_bright_blue);
+        return R.color.swap_bright_blue;
     }
 
     @Override
diff --git a/F-Droid/src/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java b/F-Droid/src/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java
index 51b4b08a3..b0bc13448 100644
--- a/F-Droid/src/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java
+++ b/F-Droid/src/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java
@@ -284,7 +284,7 @@ public class SwapWorkflowActivity extends AppCompatActivity {
             service.setStep(currentView.getStep());
         }
 
-        toolbar.setBackgroundColor(currentView.getToolbarColour());
+        toolbar.setBackgroundColor(getResources().getColor(currentView.getToolbarColour()));
         toolbar.setTitle(currentView.getToolbarTitle());
         toolbar.setNavigationIcon(R.drawable.ic_close_white);
         toolbar.setNavigationOnClickListener(new View.OnClickListener() {
@@ -604,6 +604,8 @@ public class SwapWorkflowActivity extends AppCompatActivity {
                 lrm.copyApksToRepo();
                 publishProgress(getString(R.string.copying_icons));
                 // run the icon copy without progress, its not a blocker
+                // TODO: Fix lint error about this being run from a worker thread, says it should be
+                // run on a main thread.
                 new AsyncTask<Void, Void, Void>() {
 
                     @Override
diff --git a/F-Droid/src/org/fdroid/fdroid/views/swap/WifiQrView.java b/F-Droid/src/org/fdroid/fdroid/views/swap/WifiQrView.java
index 2cb4475ba..3675a3c8e 100644
--- a/F-Droid/src/org/fdroid/fdroid/views/swap/WifiQrView.java
+++ b/F-Droid/src/org/fdroid/fdroid/views/swap/WifiQrView.java
@@ -111,7 +111,7 @@ public class WifiQrView extends ScrollView implements SwapWorkflowActivity.Inner
 
     @ColorRes
     public int getToolbarColour() {
-        return getResources().getColor(R.color.swap_blue);
+        return R.color.swap_blue;
     }
 
     @Override