diff --git a/res/layout/swap_create.xml b/res/layout/swap_create.xml
index 3fa5bb414..1c30210a6 100644
--- a/res/layout/swap_create.xml
+++ b/res/layout/swap_create.xml
@@ -1,19 +1,66 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<RelativeLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:orientation="vertical"
+<!--
+Ported from the android-19 source. This was necessary so that we could inflate
+the view ourself (and hence theme it), but also get references to the relevant
+widgets (e.g. empty text view, progress bar, list). The list_content view we
+ported this from uses hidden/internal id's that we don't get the privilege of
+using. In the process, we also:
+ * Added tools: attributes.
+ * Changed the names of an id or two so that I can reference them from Java.
+-->
+
+<!--
+/* Copyright 2010, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@android:color/white"
-        xmlns:tools="http://schemas.android.com/tools" tools:context=".views.swap.SwapActivity">
+        xmlns:tools="http://schemas.android.com/tools"
+        tools:context=".views.swap.SwapActivity">
 
-    <ListView
-            android:id="@android:id/list"
-            android:layout_height="match_parent"
+    <LinearLayout android:id="@+id/progressContainer"
+            android:orientation="vertical"
             android:layout_width="match_parent"
-            tools:listitem="@layout/applistitem"
-            tools:listheader="@layout/swap_create_header"
-            />
+            android:layout_height="match_parent"
+            android:visibility="gone"
+            android:gravity="center">
 
-</RelativeLayout>
\ No newline at end of file
+        <ProgressBar style="?android:attr/progressBarStyleLarge"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:id="@android:id/progress"/>
+
+    </LinearLayout>
+
+    <FrameLayout android:id="@+id/listContainer"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+        <ListView android:id="@android:id/list"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:drawSelectorOnTop="false"
+                tools:listitem="@layout/applistitem"
+                tools:listheader="@layout/swap_create_header" />
+        <TextView android:id="@android:id/empty"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:gravity="center"
+                android:textAppearance="?android:attr/textAppearanceLarge" />
+    </FrameLayout>
+
+</FrameLayout>
\ No newline at end of file
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 153083ffc..a023b427c 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -40,10 +40,12 @@
     </style>
 
     <style name="SwapTheme.AppList" parent="AppThemeLightWithDarkActionBar">
-        <item name="android:windowBackground">@color/white</item>
         <item name="android:background">@color/white</item>
     </style>
 
+    <style name="SwapTheme.AppList.ListItem" 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 -->
diff --git a/src/org/fdroid/fdroid/views/swap/SelectAppsFragment.java b/src/org/fdroid/fdroid/views/swap/SelectAppsFragment.java
index 58c9a273c..5e55fc73c 100644
--- a/src/org/fdroid/fdroid/views/swap/SelectAppsFragment.java
+++ b/src/org/fdroid/fdroid/views/swap/SelectAppsFragment.java
@@ -75,15 +75,27 @@ 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 = super.onCreateView(themedInflater, container, savedInstanceState);
+        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;
     }
 
@@ -98,7 +110,8 @@ public class SelectAppsFragment extends ListFragment
 
         ListView listView = getListView();
         listView.setChoiceMode(ListView.CHOICE_MODE_MULTIPLE);
-        SimpleCursorAdapter adapter = new SimpleCursorAdapter(getActivity(),
+        SimpleCursorAdapter adapter = new SimpleCursorAdapter(
+                new ContextThemeWrapper(getActivity(), R.style.SwapTheme_AppList_ListItem),
                 R.layout.select_local_apps_list_item,
                 null,
                 new String[] {