diff --git a/res/values/strings.xml b/res/values/strings.xml
index 4203c469f..37463c918 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -159,6 +159,5 @@
 	<string name="compactlayout_on">Show icons at regular size</string>
 	<string name="compactlayout_off">Show icons at a smaller size</string>
     <string name="theme">Theme</string>
-    <string name="theme_long">Choose a theme to use</string>
 
 </resources>
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index 4cf7eaea1..53e431811 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -2,11 +2,11 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
 	<PreferenceCategory android:title="@string/updates">
 		<ListPreference android:title="@string/update_interval"
-			android:summary="@string/update_interval_zero" android:key="updateInterval"
+			android:key="updateInterval"
 			android:defaultValue="24" android:entries="@array/updateIntervalNames"
 			android:entryValues="@array/updateIntervalValues" />
 		<CheckBoxPreference android:title="@string/automatic_scan_wifi"
-			android:defaultValue="false" android:summary="@string/automatic_scan_wifi_off"
+			android:defaultValue="false"
 			android:key="updateOnWifiOnly" />
 		<CheckBoxPreference android:title="@string/notify"
 			android:defaultValue="true" android:summary="@string/notify_updates_available"
@@ -24,10 +24,10 @@
             android:defaultValue="false" android:summary="@string/showPermissions_long"
             android:key="showPermissions"/>
         <CheckBoxPreference android:title="@string/compactlayout"
-            android:defaultValue="false" android:summary="@string/compactlayout_off"
+            android:defaultValue="false"
             android:key="compactlayout"/>
 		<ListPreference android:title="@string/theme"
-			android:summary="@string/theme_long" android:key="theme"
+			android:key="theme"
 			android:defaultValue="dark"
 			android:entries="@array/themeNames"
 			android:entryValues="@array/themeValues" />
@@ -37,10 +37,10 @@
            android:defaultValue="false" android:summary="@string/show_incompat_versions_l"
            android:key="incompatibleVersions" />
 		<CheckBoxPreference android:title="@string/rooted"
-			android:defaultValue="true" android:summary="@string/rooted_on"
+			android:defaultValue="true"
 			android:key="rooted" />
 		<CheckBoxPreference android:title="@string/ignoreTouch"
-			android:defaultValue="false" android:summary="@string/ignoreTouch_off"
+			android:defaultValue="false"
 			android:key="ignoreTouchscreen" />
 	</PreferenceCategory>
 	<PreferenceCategory android:title="@string/other">
diff --git a/src/org/fdroid/fdroid/PreferencesActivity.java b/src/org/fdroid/fdroid/PreferencesActivity.java
index 6a2af7e5a..0125bc87f 100644
--- a/src/org/fdroid/fdroid/PreferencesActivity.java
+++ b/src/org/fdroid/fdroid/PreferencesActivity.java
@@ -68,6 +68,10 @@ public class PreferencesActivity extends PreferenceActivity implements
         } else {
             updateInterval.setSummary(updateInterval.getEntry());
         }
+
+        ListPreference theme = (ListPreference)findPreference(
+                Preferences.PREF_THEME);
+        theme.setSummary(theme.getEntry());
     }
 
     @Override
@@ -165,6 +169,9 @@ public class PreferencesActivity extends PreferenceActivity implements
         if (key.equals(Preferences.PREF_THEME)) {
             result |= RESULT_RESTART;
             setResult(result);
+            ListPreference theme = (ListPreference)findPreference(
+                    Preferences.PREF_THEME);
+            theme.setSummary(theme.getEntry());
             return;
         }
     }