diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBApplication.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBApplication.java
index 1aa622006..f292133af 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBApplication.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBApplication.java
@@ -195,7 +195,7 @@ public class GBApplication extends Application {
     public static void releaseDB() {
         dbLock.unlock();
     }
-    
+
     public static boolean isRunningLollipopOrLater() {
         return VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP;
     }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/SettingsActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/SettingsActivity.java
index 34942ef29..d541af9cc 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/SettingsActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/SettingsActivity.java
@@ -133,11 +133,6 @@ public class SettingsActivity extends AbstractSettingsActivity {
     @Override
     protected String[] getPreferenceKeysWithSummary() {
         return new String[]{
-                "audio_player",
-                "notification_mode_calls",
-                "notification_mode_sms",
-                "notification_mode_k9mail",
-                "pebble_activitytracker",
                 "pebble_emu_addr",
                 "pebble_emu_port",
                 "pebble_reconnect_attempts",
@@ -159,7 +154,6 @@ public class SettingsActivity extends AbstractSettingsActivity {
                 "canned_reply_15",
                 "canned_reply_16",
                 PREF_USER_YEAR_OF_BIRTH,
-                PREF_USER_GENDER,
                 PREF_USER_HEIGHT_CM,
                 PREF_USER_WEIGHT_KG,
                 PREF_USER_SLEEP_DURATION,
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandPreferencesActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandPreferencesActivity.java
index 7ef19b80d..919e7d2c6 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandPreferencesActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandPreferencesActivity.java
@@ -59,20 +59,14 @@ public class MiBandPreferencesActivity extends AbstractSettingsActivity {
     protected String[] getPreferenceKeysWithSummary() {
         return new String[]{
                 PREF_USER_ALIAS,
-                PREF_MIBAND_WEARSIDE,
                 PREF_MIBAND_ADDRESS,
                 PREF_MIBAND_FITNESS_GOAL,
                 PREF_MIBAND_DONT_ACK_TRANSFER,
                 PREF_MIBAND_RESERVE_ALARM_FOR_CALENDAR,
-                getNotificationPrefKey(VIBRATION_PROFILE, ORIGIN_SMS),
                 getNotificationPrefKey(VIBRATION_COUNT, ORIGIN_SMS),
-                getNotificationPrefKey(VIBRATION_PROFILE, ORIGIN_INCOMING_CALL),
                 getNotificationPrefKey(VIBRATION_COUNT, ORIGIN_INCOMING_CALL),
-                getNotificationPrefKey(VIBRATION_PROFILE, ORIGIN_K9MAIL),
                 getNotificationPrefKey(VIBRATION_COUNT, ORIGIN_K9MAIL),
-                getNotificationPrefKey(VIBRATION_PROFILE, ORIGIN_PEBBLEMSG),
                 getNotificationPrefKey(VIBRATION_COUNT, ORIGIN_PEBBLEMSG),
-                getNotificationPrefKey(VIBRATION_PROFILE, ORIGIN_GENERIC),
                 getNotificationPrefKey(VIBRATION_COUNT, ORIGIN_GENERIC),
         };
     }
diff --git a/app/src/main/res/xml/miband_preferences.xml b/app/src/main/res/xml/miband_preferences.xml
index 042cd8e1e..c544d2544 100644
--- a/app/src/main/res/xml/miband_preferences.xml
+++ b/app/src/main/res/xml/miband_preferences.xml
@@ -14,7 +14,8 @@
             android:entries="@array/wearside"
             android:entryValues="@array/wearside_values"
             android:key="mi_wearside"
-            android:title="@string/miband_prefs_wearside" />
+            android:title="@string/miband_prefs_wearside"
+            android:summary="%s" />
 
         <EditTextPreference
             android:defaultValue="10000"
@@ -50,7 +51,8 @@
                 android:entries="@array/vibration_profile"
                 android:entryValues="@array/vibration_profile_values"
                 android:key="mi_vibration_profile_sms"
-                android:title="@string/miband_prefs_vibration" />
+                android:title="@string/miband_prefs_vibration"
+                android:summary="%s" />
 
             <EditTextPreference
                 android:defaultValue="3"
@@ -70,7 +72,8 @@
                 android:entries="@array/vibration_profile"
                 android:entryValues="@array/vibration_profile_values"
                 android:key="mi_vibration_profile_incoming_call"
-                android:title="@string/miband_prefs_vibration" />
+                android:title="@string/miband_prefs_vibration"
+                android:summary="%s" />
 
             <EditTextPreference
                 android:defaultValue="60"
@@ -90,7 +93,8 @@
                 android:entries="@array/vibration_profile"
                 android:entryValues="@array/vibration_profile_values"
                 android:key="mi_vibration_profile_k9mail"
-                android:title="@string/miband_prefs_vibration" />
+                android:title="@string/miband_prefs_vibration"
+                android:summary="%s" />
 
             <EditTextPreference
                 android:defaultValue="2"
@@ -110,7 +114,8 @@
                 android:entries="@array/vibration_profile"
                 android:entryValues="@array/vibration_profile_values"
                 android:key="mi_vibration_profile_pebblemsg"
-                android:title="@string/miband_prefs_vibration" />
+                android:title="@string/miband_prefs_vibration"
+                android:summary="%s" />
 
             <EditTextPreference
                 android:defaultValue="1"
@@ -130,7 +135,8 @@
                 android:entries="@array/vibration_profile"
                 android:entryValues="@array/vibration_profile_values"
                 android:key="mi_vibration_profile_generic"
-                android:title="@string/miband_prefs_vibration" />
+                android:title="@string/miband_prefs_vibration"
+                android:summary="%s" />
 
             <EditTextPreference
                 android:defaultValue="3"
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index 4d49eba12..dad3bc0bd 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -10,7 +10,8 @@
         <ListPreference
             android:defaultValue="default"
             android:key="audio_player"
-            android:title="@string/pref_title_audo_player" />
+            android:title="@string/pref_title_audo_player"
+            android:summary="%s" />
         <ListPreference
             android:key="pref_key_theme"
             android:title="@string/pref_title_theme"
@@ -37,21 +38,24 @@
             android:entries="@array/notification_mode_toggle"
             android:entryValues="@array/notification_mode_values_toggle"
             android:key="notification_mode_calls"
-            android:title="@string/pref_title_notifications_call" />
+            android:title="@string/pref_title_notifications_call"
+            android:summary="%s" />
 
         <ListPreference
             android:defaultValue="when_screen_off"
             android:entries="@array/notification_mode"
             android:entryValues="@array/notification_mode_values"
             android:key="notification_mode_sms"
-            android:title="@string/pref_title_notifications_sms" />
+            android:title="@string/pref_title_notifications_sms"
+            android:summary="%s" />
 
         <ListPreference
             android:defaultValue="when_screen_off"
             android:entries="@array/notification_mode"
             android:entryValues="@array/notification_mode_values"
             android:key="notification_mode_k9mail"
-            android:title="@string/pref_title_notifications_k9mail" />
+            android:title="@string/pref_title_notifications_k9mail"
+            android:summary="%s" />
 
         <ListPreference
             android:defaultValue="when_screen_off"
@@ -146,7 +150,8 @@
             android:entries="@array/gender"
             android:entryValues="@array/gender_values"
             android:key="activity_user_gender"
-            android:title="@string/activity_prefs_gender" />
+            android:title="@string/activity_prefs_gender"
+            android:summary="%s" />
 
         <!--TODO: support localized heights and weights -->
         <EditTextPreference
@@ -198,7 +203,8 @@
                     android:entries="@array/pebble_activitytracker"
                     android:entryValues="@array/pebble_activitytracker_values"
                     android:key="pebble_activitytracker"
-                    android:title="@string/pref_title_pebble_activitytracker" />
+                    android:title="@string/pref_title_pebble_activitytracker"
+                    android:summary="%s" />
             </PreferenceCategory>
             <PreferenceCategory
                 android:key="pref_key_development"