diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index f3125071f..87c152102 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -330,6 +330,15 @@
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value=".FDroid" />
         </activity>
+        <activity
+            android:label="@string/swap"
+            android:name=".views.swap.SwapAppListActivity"
+            android:parentActivityName=".FDroid"
+            android:theme="@style/SwapTheme.AppList">
+            <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
index f88513142..8d1a398bb 100644
Binary files a/res/drawable-hdpi/ic_swap.png 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
index 6b494f0a5..8e3db56d7 100644
Binary files a/res/drawable-hdpi/nfc_touch.png and b/res/drawable-hdpi/nfc_touch.png differ
diff --git a/res/drawable-hdpi/swap_success.png b/res/drawable-hdpi/swap_success.png
new file mode 100644
index 000000000..37c70423c
Binary files /dev/null and b/res/drawable-hdpi/swap_success.png differ
diff --git a/res/drawable-hdpi/wifi.png b/res/drawable-hdpi/wifi.png
index dc11620b0..813a63e9b 100644
Binary files a/res/drawable-hdpi/wifi.png 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
index 8468b1ffb..67658d768 100644
Binary files a/res/drawable-hdpi/wifi_ap_personal.png 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
index 6805f8c1e..7f03f522d 100644
Binary files a/res/drawable-hdpi/wifi_ap_private.png 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
index 0b71a9dd5..d00ae9392 100644
Binary files a/res/drawable-hdpi/wifi_ap_public.png 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
index 1b4cffe25..46e4bff13 100644
Binary files a/res/drawable-ldpi/ic_swap.png 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
index 31cf96164..55a4e5065 100644
Binary files a/res/drawable-ldpi/nfc_touch.png and b/res/drawable-ldpi/nfc_touch.png differ
diff --git a/res/drawable-ldpi/swap_success.png b/res/drawable-ldpi/swap_success.png
new file mode 100644
index 000000000..44e3a077f
Binary files /dev/null and b/res/drawable-ldpi/swap_success.png differ
diff --git a/res/drawable-ldpi/wifi.png b/res/drawable-ldpi/wifi.png
index cda16f5a2..9ebb4501b 100644
Binary files a/res/drawable-ldpi/wifi.png 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
index c05f03c45..d4b79ae90 100644
Binary files a/res/drawable-ldpi/wifi_ap_personal.png 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
index 33c095ef5..233d11337 100644
Binary files a/res/drawable-ldpi/wifi_ap_private.png 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
index a41820a96..a538bfbf5 100644
Binary files a/res/drawable-ldpi/wifi_ap_public.png 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
index 9f7158f97..2a492ce90 100644
Binary files a/res/drawable-mdpi/ic_swap.png 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
index 47bd7b941..1bd5dca42 100644
Binary files a/res/drawable-mdpi/nfc_touch.png and b/res/drawable-mdpi/nfc_touch.png differ
diff --git a/res/drawable-mdpi/swap_success.png b/res/drawable-mdpi/swap_success.png
new file mode 100644
index 000000000..94f07ce42
Binary files /dev/null and b/res/drawable-mdpi/swap_success.png differ
diff --git a/res/drawable-mdpi/wifi.png b/res/drawable-mdpi/wifi.png
index a9906c067..484b4a14c 100644
Binary files a/res/drawable-mdpi/wifi.png 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
index 98946a705..00a0e5174 100644
Binary files a/res/drawable-mdpi/wifi_ap_personal.png 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
index cb0009279..e0be8562e 100644
Binary files a/res/drawable-mdpi/wifi_ap_private.png 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
index be384b8b8..10a14c570 100644
Binary files a/res/drawable-mdpi/wifi_ap_public.png 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
index c93fc90b5..ddb32abc7 100644
Binary files a/res/drawable-xhdpi/ic_swap.png 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
index 6ed6d2cce..e687d1076 100644
Binary files a/res/drawable-xhdpi/nfc_touch.png and b/res/drawable-xhdpi/nfc_touch.png differ
diff --git a/res/drawable-xhdpi/swap_success.png b/res/drawable-xhdpi/swap_success.png
new file mode 100644
index 000000000..7b4955eaf
Binary files /dev/null and b/res/drawable-xhdpi/swap_success.png differ
diff --git a/res/drawable-xhdpi/wifi.png b/res/drawable-xhdpi/wifi.png
index 3bc34fc73..f45541341 100644
Binary files a/res/drawable-xhdpi/wifi.png 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
index ee8fae4da..56f3216cf 100644
Binary files a/res/drawable-xhdpi/wifi_ap_personal.png 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
index c39be8d3c..62fc961fc 100644
Binary files a/res/drawable-xhdpi/wifi_ap_private.png 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
index 56f4c5548..2eef507b8 100644
Binary files a/res/drawable-xhdpi/wifi_ap_public.png and b/res/drawable-xhdpi/wifi_ap_public.png differ
diff --git a/res/drawable/ic_swap.png b/res/drawable/ic_swap.png
index 030ad9323..01e501ea8 100644
Binary files a/res/drawable/ic_swap.png and b/res/drawable/ic_swap.png differ
diff --git a/res/drawable/nfc_touch.png b/res/drawable/nfc_touch.png
index e7a805646..e687d1076 100644
Binary files a/res/drawable/nfc_touch.png and b/res/drawable/nfc_touch.png differ
diff --git a/res/drawable/swap_success.png b/res/drawable/swap_success.png
new file mode 100644
index 000000000..7863934b4
Binary files /dev/null and b/res/drawable/swap_success.png differ
diff --git a/res/drawable/wifi.png b/res/drawable/wifi.png
index b7d1da660..b0f97598a 100644
Binary files a/res/drawable/wifi.png and b/res/drawable/wifi.png differ
diff --git a/res/drawable/wifi_ap_personal.png b/res/drawable/wifi_ap_personal.png
index ee8fae4da..56f3216cf 100644
Binary files a/res/drawable/wifi_ap_personal.png 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
index c39be8d3c..62fc961fc 100644
Binary files a/res/drawable/wifi_ap_private.png 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
index 56f4c5548..2eef507b8 100644
Binary files a/res/drawable/wifi_ap_public.png and b/res/drawable/wifi_ap_public.png differ
diff --git a/res/layout/swap_create.xml b/res/layout/list_content.xml
similarity index 100%
rename from res/layout/swap_create.xml
rename to res/layout/list_content.xml
diff --git a/res/layout/swap_blank.xml b/res/layout/swap_blank.xml
index 6ed3b2571..a865c22ab 100644
--- a/res/layout/swap_blank.xml
+++ b/res/layout/swap_blank.xml
@@ -9,14 +9,14 @@
     <TextView
             android:id="@+id/text_description"
             android:text="Your mobile device becomes an app store with Swap!"
-            style="@style/SwapTheme.AppList.MainText"
+            style="@style/SwapTheme.StartSwap.MainText"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content" />
 
     <Button
             android:id="@+id/button_start_swap"
             android:text="START A SWAP"
-            style="@style/SwapTheme.AppList.StartButton"
+            style="@style/SwapTheme.StartSwap.StartButton"
             android:layout_width="match_parent"
             android:layout_below="@+id/text_description"
             android:layout_centerHorizontal="true"/>
diff --git a/res/layout/swap_create_header.xml b/res/layout/swap_create_header.xml
index 80a20ea2c..7c93951e0 100644
--- a/res/layout/swap_create_header.xml
+++ b/res/layout/swap_create_header.xml
@@ -3,6 +3,6 @@
         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"
+        style="@style/SwapTheme.StartSwap.MainText"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content" />
diff --git a/res/layout/swap_success_header.xml b/res/layout/swap_success_header.xml
new file mode 100644
index 000000000..cd5575c8e
--- /dev/null
+++ b/res/layout/swap_success_header.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+    <TextView
+            android:id="@+id/text_title"
+            android:text="Swap success!"
+            style="@style/SwapTheme.AppList.SwapSuccess"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal" />
+
+    <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@drawable/swap_success"
+            android:layout_gravity="center_horizontal" />
+
+    <TextView
+            android:id="@+id/text_description"
+            android:text="Tap an app for details and to install."
+            style="@style/SwapTheme.AppList.SwapSuccessDetails"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/values/styles.xml b/res/values/styles.xml
index a023b427c..fa3512fe8 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -39,14 +39,17 @@
         <item name="android:actionButtonStyle">@style/SwapTheme.Wizard.ActionButton</item>
     </style>
 
-    <style name="SwapTheme.AppList" parent="AppThemeLightWithDarkActionBar">
+    <style name="SwapTheme.StartSwap" parent="AppThemeLightWithDarkActionBar">
         <item name="android:background">@color/white</item>
     </style>
 
+    <style name="SwapTheme.AppList" parent="AppThemeLightWithDarkActionBar">
+    </style>
+
     <style name="SwapTheme.AppList.ListItem" parent="AppThemeLightWithDarkActionBar">
     </style>
 
-    <style name="SwapTheme.AppList.StartButton">
+    <style name="SwapTheme.StartSwap.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 -->
@@ -60,7 +63,23 @@
 
     </style>
 
-    <style name="SwapTheme.AppList.MainText">
+    <style name="SwapTheme.AppList.SwapSuccess">
+        <item name="android:textAlignment">center</item>
+        <item name="android:textSize">25.7sp</item> <!-- 46px * 96dpi / 160dpi -->
+        <item name="android:paddingTop">28dp</item> <!-- 50px * 96dpi / 160dpi -->
+        <item name="android:paddingBottom">20.1dp</item> <!-- 36px * 96dpi / 160dpi -->
+        <item name="android:fontFamily">sans-serif-light</item>
+    </style>
+
+    <style name="SwapTheme.AppList.SwapSuccessDetails">
+        <item name="android:textAlignment">center</item>
+        <item name="android:textSize">20.1sp</item> <!-- 36px * 96dpi / 160dpi -->
+        <item name="android:paddingTop">20.1dp</item> <!-- 36px * 96dpi / 160dpi -->
+        <item name="android:paddingBottom">20.1dp</item> <!-- 36px * 96dpi / 160dpi -->
+        <item name="android:textStyle">bold</item>
+    </style>
+
+    <style name="SwapTheme.StartSwap.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 -->
diff --git a/src/org/fdroid/fdroid/views/fragments/AppListFragment.java b/src/org/fdroid/fdroid/views/fragments/AppListFragment.java
index c0e1f894a..f0453ee5e 100644
--- a/src/org/fdroid/fdroid/views/fragments/AppListFragment.java
+++ b/src/org/fdroid/fdroid/views/fragments/AppListFragment.java
@@ -6,22 +6,21 @@ import android.content.SharedPreferences;
 import android.database.Cursor;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.v4.app.ListFragment;
 import android.support.v4.app.LoaderManager;
 import android.support.v4.content.CursorLoader;
 import android.support.v4.content.Loader;
 import android.util.Log;
 import android.view.View;
 import android.widget.AdapterView;
-
-import com.nostra13.universalimageloader.core.ImageLoader;
-import com.nostra13.universalimageloader.core.listener.PauseOnScrollListener;
-import org.fdroid.fdroid.*;
+import org.fdroid.fdroid.AppDetails;
+import org.fdroid.fdroid.FDroid;
+import org.fdroid.fdroid.Preferences;
+import org.fdroid.fdroid.UpdateService;
 import org.fdroid.fdroid.data.App;
 import org.fdroid.fdroid.data.AppProvider;
 import org.fdroid.fdroid.views.AppListAdapter;
 
-abstract public class AppListFragment extends ListFragment implements
+abstract public class AppListFragment extends ThemeableListFragment implements
         AdapterView.OnItemClickListener,
         Preferences.ChangeListener,
         LoaderManager.LoaderCallbacks<Cursor> {
diff --git a/src/org/fdroid/fdroid/views/fragments/ThemeableListFragment.java b/src/org/fdroid/fdroid/views/fragments/ThemeableListFragment.java
new file mode 100644
index 000000000..0a846ca67
--- /dev/null
+++ b/src/org/fdroid/fdroid/views/fragments/ThemeableListFragment.java
@@ -0,0 +1,65 @@
+package org.fdroid.fdroid.views.fragments;
+
+import android.content.Context;
+import android.os.Bundle;
+import android.support.v4.app.ListFragment;
+import android.view.ContextThemeWrapper;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ListView;
+import org.fdroid.fdroid.R;
+
+public abstract class ThemeableListFragment extends ListFragment {
+
+    protected int getThemeStyle() {
+        return 0;
+    }
+
+    protected int getHeaderLayout() {
+        return 0;
+    }
+
+    protected View getHeaderView(LayoutInflater inflater, ViewGroup container) {
+        if (getHeaderLayout() > 0) {
+            return inflater.inflate(getHeaderLayout(), null, false);
+        } else {
+            return null;
+        }
+    }
+
+    private LayoutInflater getThemedInflater(Context context)
+    {
+        Context c = (getThemeStyle() == 0) ? context : new ContextThemeWrapper(context, getThemeStyle());
+        return (LayoutInflater)c.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+    }
+
+    /**
+     * Normally we'd just let the baseclass ListFrament.onCreateView() from the support library do its magic.
+     * However, it doesn't allow us to theme it. That is, it always passes getActivity() into the constructor
+     * of widgets. We are more interested in a ContextThemeWrapper, so that the widgets get appropriately
+     * themed. In order to get it working, we need to work around android bug 21742 as well
+     * (https://code.google.com/p/android/issues/detail?id=21742).
+     */
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+
+        LayoutInflater themedInflater = getThemedInflater(inflater.getContext());
+
+        View view = themedInflater.inflate(R.layout.list_content, container, false);
+
+        View headerView = getHeaderView(themedInflater, container);
+        if (headerView != null) {
+            ListView listView = (ListView) view.findViewById(android.R.id.list);
+            listView.addHeaderView(headerView);
+        }
+
+        // Workaround for https://code.google.com/p/android/issues/detail?id=21742
+        view.findViewById(android.R.id.empty).setId(0x00ff0001);
+        view.findViewById(R.id.progressContainer).setId(0x00ff0002);
+        view.findViewById(android.R.id.progress).setId(0x00ff0003);
+
+        return view;
+    }
+
+}
diff --git a/src/org/fdroid/fdroid/views/swap/ConfirmReceiveSwapFragment.java b/src/org/fdroid/fdroid/views/swap/ConfirmReceiveSwapFragment.java
index 2e01cbbbe..f3798b520 100644
--- a/src/org/fdroid/fdroid/views/swap/ConfirmReceiveSwapFragment.java
+++ b/src/org/fdroid/fdroid/views/swap/ConfirmReceiveSwapFragment.java
@@ -2,7 +2,6 @@ package org.fdroid.fdroid.views.swap;
 
 import android.app.Activity;
 import android.content.ContentValues;
-import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
@@ -94,10 +93,11 @@ public class ConfirmReceiveSwapFragment extends Fragment implements ProgressList
 
         if (event.type.equals(UpdateService.EVENT_COMPLETE_AND_SAME) ||
                 event.type.equals(UpdateService.EVENT_COMPLETE_WITH_CHANGES)) {
-            Intent intent = new Intent();
-            intent.putExtra("category", parser.getHost()); // TODO: Load repo from database to get proper name. This is what the category we want to select will be called.
+            ((ConnectSwapActivity)getActivity()).onRepoUpdated();
+            /*Intent intent = new Intent();
+            intent.putExtra("category", newRepoConfig.getHost()); // TODO: Load repo from database to get proper name. This is what the category we want to select will be called.
             getActivity().setResult(Activity.RESULT_OK, intent);
-            finish();
+            finish();*/
         } else if (event.type.equals(UpdateService.EVENT_ERROR)) {
             // TODO: Show message on this screen (with a big "okay" button that goes back to F-Droid activity)
             // rather than finishing directly.
diff --git a/src/org/fdroid/fdroid/views/swap/ConnectSwapActivity.java b/src/org/fdroid/fdroid/views/swap/ConnectSwapActivity.java
index b6923d366..56231bef5 100644
--- a/src/org/fdroid/fdroid/views/swap/ConnectSwapActivity.java
+++ b/src/org/fdroid/fdroid/views/swap/ConnectSwapActivity.java
@@ -1,5 +1,6 @@
 package org.fdroid.fdroid.views.swap;
 
+import android.content.Intent;
 import android.os.Bundle;
 import android.support.v4.app.FragmentActivity;
 import android.support.v4.app.FragmentManager;
@@ -7,6 +8,7 @@ import android.support.v4.app.FragmentManager;
 public class ConnectSwapActivity extends FragmentActivity {
 
     private static final String STATE_CONFIRM = "startSwap";
+    private static final String STATE_APP_LIST = "swapAppList";
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
@@ -24,6 +26,7 @@ public class ConnectSwapActivity extends FragmentActivity {
         }
 
     }
+
     @Override
     public void onBackPressed() {
         if (currentState().equals(STATE_CONFIRM)) {
@@ -34,8 +37,15 @@ public class ConnectSwapActivity extends FragmentActivity {
     }
 
     private String currentState() {
-        FragmentManager.BackStackEntry lastFragment = getSupportFragmentManager().getBackStackEntryAt(getSupportFragmentManager().getBackStackEntryCount() - 1);
+        int index = getSupportFragmentManager().getBackStackEntryCount() - 1;
+        FragmentManager.BackStackEntry lastFragment = getSupportFragmentManager().getBackStackEntryAt(index);
         return lastFragment.getName();
     }
 
+    public void onRepoUpdated() {
+
+        Intent intent = new Intent(this, SwapAppListActivity.class);
+        startActivity(intent);
+
+    }
 }
diff --git a/src/org/fdroid/fdroid/views/swap/SelectAppsFragment.java b/src/org/fdroid/fdroid/views/swap/SelectAppsFragment.java
index 5e55fc73c..ee9fc7da6 100644
--- a/src/org/fdroid/fdroid/views/swap/SelectAppsFragment.java
+++ b/src/org/fdroid/fdroid/views/swap/SelectAppsFragment.java
@@ -1,12 +1,10 @@
 package org.fdroid.fdroid.views.swap;
 
-import android.content.Context;
 import android.content.pm.PackageManager;
 import android.database.Cursor;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.v4.app.ListFragment;
 import android.support.v4.app.LoaderManager;
 import android.support.v4.content.CursorLoader;
 import android.support.v4.content.Loader;
@@ -14,9 +12,7 @@ import android.support.v4.widget.SimpleCursorAdapter;
 import android.text.TextUtils;
 import android.view.ActionMode;
 import android.view.ContextThemeWrapper;
-import android.view.LayoutInflater;
 import android.view.View;
-import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.ListView;
@@ -26,11 +22,12 @@ import org.fdroid.fdroid.FDroidApp;
 import org.fdroid.fdroid.R;
 import org.fdroid.fdroid.data.InstalledAppProvider;
 import org.fdroid.fdroid.localrepo.LocalRepoManager;
+import org.fdroid.fdroid.views.fragments.ThemeableListFragment;
 
 import java.util.HashSet;
 import java.util.Set;
 
-public class SelectAppsFragment extends ListFragment
+public class SelectAppsFragment extends ThemeableListFragment
     implements LoaderManager.LoaderCallbacks<Cursor>, SearchView.OnQueryTextListener {
 
     private PackageManager packageManager;
@@ -75,30 +72,6 @@ public class SelectAppsFragment extends ListFragment
         return false;
     }
 
-    /**
-     * Normally we'd just let the baseclass ListFrament.onCreateView() from the support library do its magic.
-     * However, it doesn't allow us to theme it. That is, it always passes getActivity() into the constructor
-     * of widgets. We are more interested in a ContextThemeWrapper, so that the widgets get appropriately
-     * themed. In order to get it working, we need to work around android bug 21742 as well
-     * (https://code.google.com/p/android/issues/detail?id=21742).
-     */
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-
-        LayoutInflater themedInflater = (LayoutInflater)new ContextThemeWrapper(inflater.getContext(), R.style.SwapTheme_AppList).getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-
-        View view = themedInflater.inflate(R.layout.swap_create, container, false);
-        ListView listView = (ListView)view.findViewById(android.R.id.list);
-        listView.addHeaderView(themedInflater.inflate(R.layout.swap_create_header, null, false));
-
-        // Workaround for https://code.google.com/p/android/issues/detail?id=21742
-        view.findViewById(android.R.id.empty).setId(0x00ff0001);
-        view.findViewById(R.id.progressContainer).setId(0x00ff0002);
-        view.findViewById(android.R.id.progress).setId(0x00ff0003);
-
-        return view;
-    }
-
     @Override
     public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
@@ -246,4 +219,13 @@ public class SelectAppsFragment extends ListFragment
         return mCurrentFilterString;
     }
 
+    @Override
+    protected int getThemeStyle() {
+        return R.style.SwapTheme_StartSwap;
+    }
+
+    @Override
+    protected int getHeaderLayout() {
+        return R.layout.swap_create_header;
+    }
 }
diff --git a/src/org/fdroid/fdroid/views/swap/StartSwapFragment.java b/src/org/fdroid/fdroid/views/swap/StartSwapFragment.java
index 1cb67f099..1eb5cb883 100644
--- a/src/org/fdroid/fdroid/views/swap/StartSwapFragment.java
+++ b/src/org/fdroid/fdroid/views/swap/StartSwapFragment.java
@@ -22,7 +22,7 @@ public class StartSwapFragment extends Fragment {
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
 
-        LayoutInflater themedInflater = (LayoutInflater)new ContextThemeWrapper(inflater.getContext(), R.style.SwapTheme_AppList).getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+        LayoutInflater themedInflater = (LayoutInflater)new ContextThemeWrapper(inflater.getContext(), R.style.SwapTheme_StartSwap).getSystemService(Context.LAYOUT_INFLATER_SERVICE);
 
         View view = themedInflater.inflate(R.layout.swap_blank, container, false);
         view.findViewById(R.id.button_start_swap).setOnClickListener(new View.OnClickListener() {
diff --git a/src/org/fdroid/fdroid/views/swap/SwapAppListActivity.java b/src/org/fdroid/fdroid/views/swap/SwapAppListActivity.java
new file mode 100644
index 000000000..c852ef2b7
--- /dev/null
+++ b/src/org/fdroid/fdroid/views/swap/SwapAppListActivity.java
@@ -0,0 +1,52 @@
+package org.fdroid.fdroid.views.swap;
+
+import android.net.Uri;
+import android.os.Bundle;
+import android.support.v7.app.ActionBarActivity;
+import org.fdroid.fdroid.R;
+import org.fdroid.fdroid.data.AppProvider;
+import org.fdroid.fdroid.views.AppListAdapter;
+import org.fdroid.fdroid.views.AvailableAppListAdapter;
+import org.fdroid.fdroid.views.fragments.AppListFragment;
+
+public class SwapAppListActivity extends ActionBarActivity {
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+
+        super.onCreate(savedInstanceState);
+
+        if (savedInstanceState == null) {
+            getSupportFragmentManager()
+                    .beginTransaction()
+                    .add(android.R.id.content, new SwapAppListFragment())
+                    .commit();
+        }
+
+    }
+
+    private static class SwapAppListFragment extends AppListFragment {
+
+        @Override
+        protected int getHeaderLayout() {
+            return R.layout.swap_success_header;
+        }
+
+        @Override
+        protected AppListAdapter getAppListAdapter() {
+            return new AvailableAppListAdapter(getActivity(), null);
+        }
+
+        @Override
+        protected String getFromTitle() {
+            return getString(R.string.swap);
+        }
+
+        @Override
+        protected Uri getDataUri() {
+            return AppProvider.getCategoryUri("LocalRepo");
+        }
+
+    }
+
+}