diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 2a8046a37..6a26acecc 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -277,11 +277,6 @@
 
     <!-- ========================================================= Plugins = -->
 
-    <activity
-      android:label="@string/EPr_appearance_header"
-      android:name=".preferences.AppearancePreferences"
-      android:theme="@style/Tasks"/>
-
     <activity
       android:label="@string/date_and_time"
       android:name=".preferences.DateTimePreferences"
diff --git a/app/src/main/java/org/tasks/injection/ActivityComponent.java b/app/src/main/java/org/tasks/injection/ActivityComponent.java
index c5e3772c8..158328ff7 100644
--- a/app/src/main/java/org/tasks/injection/ActivityComponent.java
+++ b/app/src/main/java/org/tasks/injection/ActivityComponent.java
@@ -31,7 +31,6 @@ import org.tasks.files.MyFilePickerActivity;
 import org.tasks.locale.ui.activity.TaskerCreateTaskActivity;
 import org.tasks.locale.ui.activity.TaskerSettingsActivity;
 import org.tasks.location.LocationPickerActivity;
-import org.tasks.preferences.AppearancePreferences;
 import org.tasks.preferences.AttributionActivity;
 import org.tasks.preferences.BasicPreferences;
 import org.tasks.preferences.DateTimePreferences;
@@ -115,8 +114,6 @@ public interface ActivityComponent {
 
   void inject(DateTimePreferences dateTimePreferences);
 
-  void inject(AppearancePreferences appearancePreferences);
-
   void inject(MyFilePickerActivity myFilePickerActivity);
 
   void inject(ColorPickerActivity colorPickerActivity);
diff --git a/app/src/main/java/org/tasks/injection/InjectingPreferenceActivity.java b/app/src/main/java/org/tasks/injection/InjectingPreferenceActivity.java
index f4925ae07..bb93b7c61 100644
--- a/app/src/main/java/org/tasks/injection/InjectingPreferenceActivity.java
+++ b/app/src/main/java/org/tasks/injection/InjectingPreferenceActivity.java
@@ -20,6 +20,8 @@ import com.todoroo.astrid.activity.MainActivity;
 import com.todoroo.astrid.api.Filter;
 import javax.inject.Inject;
 import org.tasks.R;
+import org.tasks.analytics.Tracker;
+import org.tasks.analytics.Tracking;
 import org.tasks.dialogs.DialogBuilder;
 import org.tasks.locale.Locale;
 import org.tasks.preferences.AppCompatPreferenceActivity;
@@ -31,10 +33,15 @@ import timber.log.Timber;
 public abstract class InjectingPreferenceActivity extends AppCompatPreferenceActivity
     implements InjectingActivity, OnMenuItemClickListener {
 
+  public static final String EXTRA_RESTART = "extra_restart";
+  private static final String EXTRA_BUNDLE = "extra_bundle";
+
   @Inject DialogBuilder dialogBuilder;
   @Inject Device device;
+  @Inject Tracker tracker;
 
   private ActivityComponent activityComponent;
+  private Bundle result;
 
   protected InjectingPreferenceActivity() {
     Locale.getInstance(this).applyOverrideConfiguration(this);
@@ -52,6 +59,8 @@ public abstract class InjectingPreferenceActivity extends AppCompatPreferenceAct
 
     super.onCreate(savedInstanceState);
 
+    result = savedInstanceState == null ? new Bundle() : savedInstanceState.getBundle(EXTRA_BUNDLE);
+
     ViewGroup root = findViewById(android.R.id.content);
     View content = root.getChildAt(0);
     LinearLayout toolbarContainer =
@@ -150,6 +159,21 @@ public abstract class InjectingPreferenceActivity extends AppCompatPreferenceAct
     }
   }
 
+  @Override
+  protected void onSaveInstanceState(Bundle outState) {
+    super.onSaveInstanceState(outState);
+
+    outState.putBundle(EXTRA_BUNDLE, result);
+  }
+
+  @Override
+  public void finish() {
+    Intent data = new Intent();
+    data.putExtras(result);
+    setResult(RESULT_OK, data);
+    super.finish();
+  }
+
   protected void emailSupport() {
     startActivity(
         new Intent(
@@ -162,4 +186,28 @@ public abstract class InjectingPreferenceActivity extends AppCompatPreferenceAct
   protected String getHelpUrl() {
     return "http://tasks.org/help";
   }
+
+  protected void forceRestart() {
+    result.putBoolean(EXTRA_RESTART, true);
+  }
+
+  protected void mergeResults(Bundle bundle) {
+    result.putAll(bundle);
+  }
+
+  protected void setExtraOnChange(final String extra, final int... resIds) {
+    for (int resId : resIds) {
+      setExtraOnChange(resId, extra);
+    }
+  }
+
+  protected void setExtraOnChange(final int resId, final String extra) {
+    findPreference(getString(resId))
+        .setOnPreferenceChangeListener(
+            (preference, newValue) -> {
+              tracker.reportEvent(Tracking.Events.SET_PREFERENCE, resId, newValue.toString());
+              result.putBoolean(extra, true);
+              return true;
+            });
+  }
 }
diff --git a/app/src/main/java/org/tasks/preferences/AppearancePreferences.java b/app/src/main/java/org/tasks/preferences/AppearancePreferences.java
deleted file mode 100644
index 9a93e14e8..000000000
--- a/app/src/main/java/org/tasks/preferences/AppearancePreferences.java
+++ /dev/null
@@ -1,191 +0,0 @@
-package org.tasks.preferences;
-
-import static org.tasks.dialogs.NativeSeekBarDialog.newSeekBarDialog;
-
-import android.content.Intent;
-import android.os.Bundle;
-import android.preference.Preference;
-import com.todoroo.astrid.activity.BeastModePreferences;
-import com.todoroo.astrid.api.Filter;
-import javax.inject.Inject;
-import org.tasks.LocalBroadcastManager;
-import org.tasks.R;
-import org.tasks.activities.FilterSelectionActivity;
-import org.tasks.analytics.Tracker;
-import org.tasks.analytics.Tracking;
-import org.tasks.dialogs.NativeSeekBarDialog;
-import org.tasks.injection.ActivityComponent;
-import org.tasks.injection.InjectingPreferenceActivity;
-import org.tasks.locale.Locale;
-
-public class AppearancePreferences extends InjectingPreferenceActivity
-    implements NativeSeekBarDialog.SeekBarCallback {
-
-  public static final String EXTRA_RESTART = "extra_restart";
-  private static final String EXTRA_FILTERS_CHANGED = "extra_filters_changed";
-  private static final int REQUEST_CUSTOMIZE = 1004;
-  private static final int REQUEST_DEFAULT_LIST = 1005;
-  private static final int REQUEST_ROW_PADDING = 1006;
-  private static final int REQUEST_FONT_SIZE = 1007;
-  private static final String FRAG_TAG_ROW_PADDING_SEEKBAR = "frag_tag_row_padding_seekbar";
-  private static final String FRAG_TAG_FONT_SIZE_SEEKBAR = "frag_tag_font_size_seekbar";
-  private static final String EXTRA_BUNDLE = "extra_bundle";
-  @Inject Preferences preferences;
-  @Inject DefaultFilterProvider defaultFilterProvider;
-  @Inject Tracker tracker;
-  @Inject LocalBroadcastManager localBroadcastManager;
-  @Inject Locale locale;
-
-  private Bundle result;
-
-  @Override
-  public void onCreate(Bundle savedInstanceState) {
-    super.onCreate(savedInstanceState);
-
-    result = savedInstanceState == null ? new Bundle() : savedInstanceState.getBundle(EXTRA_BUNDLE);
-
-    addPreferencesFromResource(R.xml.preferences_appearance);
-
-    setExtraOnChange(
-        EXTRA_RESTART,
-        R.string.p_fontSize,
-        R.string.p_rowPadding,
-        R.string.p_fullTaskTitle,
-        R.string.p_show_description,
-        R.string.p_show_full_description,
-        R.string.p_linkify_task_list,
-        R.string.p_show_list_indicators);
-    setExtraOnChange(R.string.p_show_today_filter, EXTRA_FILTERS_CHANGED);
-    setExtraOnChange(R.string.p_show_recently_modified_filter, EXTRA_FILTERS_CHANGED);
-    setExtraOnChange(R.string.p_show_not_in_list_filter, EXTRA_FILTERS_CHANGED);
-    findPreference(getString(R.string.customize_edit_screen))
-        .setOnPreferenceClickListener(
-            preference -> {
-              startActivityForResult(
-                  new Intent(AppearancePreferences.this, BeastModePreferences.class),
-                  REQUEST_CUSTOMIZE);
-              return true;
-            });
-
-    findPreference(R.string.p_fontSize)
-        .setOnPreferenceClickListener(
-            preference -> {
-              newSeekBarDialog(
-                      R.layout.dialog_font_size_seekbar,
-                      10,
-                      48,
-                      preferences.getFontSize(),
-                      REQUEST_FONT_SIZE)
-                  .show(getFragmentManager(), FRAG_TAG_FONT_SIZE_SEEKBAR);
-              return false;
-            });
-    updateFontSize();
-
-    findPreference(R.string.p_rowPadding)
-        .setOnPreferenceClickListener(
-            preference -> {
-              newSeekBarDialog(
-                      R.layout.dialog_font_size_seekbar,
-                      0,
-                      16,
-                      preferences.getRowPadding(),
-                      REQUEST_ROW_PADDING)
-                  .show(getFragmentManager(), FRAG_TAG_ROW_PADDING_SEEKBAR);
-              return false;
-            });
-    updateRowPadding();
-    Preference defaultList = findPreference(getString(R.string.p_default_list));
-    Filter filter = defaultFilterProvider.getDefaultFilter();
-    defaultList.setSummary(filter.listingTitle);
-    defaultList.setOnPreferenceClickListener(
-        preference -> {
-          Intent intent = new Intent(AppearancePreferences.this, FilterSelectionActivity.class);
-          intent.putExtra(
-              FilterSelectionActivity.EXTRA_FILTER, defaultFilterProvider.getDefaultFilter());
-          intent.putExtra(FilterSelectionActivity.EXTRA_RETURN_FILTER, true);
-          startActivityForResult(intent, REQUEST_DEFAULT_LIST);
-          return true;
-        });
-  }
-
-  @Override
-  protected void onSaveInstanceState(Bundle outState) {
-    super.onSaveInstanceState(outState);
-
-    outState.putBundle(EXTRA_BUNDLE, result);
-  }
-
-  @Override
-  public void finish() {
-    Intent data = new Intent();
-    data.putExtras(result);
-    setResult(RESULT_OK, data);
-    super.finish();
-  }
-
-  @Override
-  protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-    if (requestCode == REQUEST_CUSTOMIZE) {
-      if (resultCode == RESULT_OK) {
-        result.putBoolean(EXTRA_RESTART, true);
-      }
-    } else if (requestCode == REQUEST_DEFAULT_LIST) {
-      if (resultCode == RESULT_OK) {
-        Filter filter = data.getParcelableExtra(FilterSelectionActivity.EXTRA_FILTER);
-        defaultFilterProvider.setDefaultFilter(filter);
-        findPreference(getString(R.string.p_default_list)).setSummary(filter.listingTitle);
-        localBroadcastManager.broadcastRefresh();
-      }
-    } else {
-      super.onActivityResult(requestCode, resultCode, data);
-    }
-  }
-
-  private void setExtraOnChange(final int resId, final String extra) {
-    findPreference(getString(resId))
-        .setOnPreferenceChangeListener(
-            (preference, newValue) -> {
-              tracker.reportEvent(Tracking.Events.SET_PREFERENCE, resId, newValue.toString());
-              result.putBoolean(extra, true);
-              return true;
-            });
-  }
-
-  private void setExtraOnChange(final String extra, final int... resIds) {
-    for (int resId : resIds) {
-      setExtraOnChange(resId, extra);
-    }
-  }
-
-  @Override
-  public void inject(ActivityComponent component) {
-    component.inject(this);
-  }
-
-  @Override
-  public void valueSelected(int value, int requestCode) {
-    int resId = 0;
-    if (requestCode == REQUEST_ROW_PADDING) {
-      preferences.setInt(R.string.p_rowPadding, value);
-      updateRowPadding();
-      resId = R.string.p_rowPadding;
-    } else if (requestCode == REQUEST_FONT_SIZE) {
-      preferences.setInt(R.string.p_fontSize, value);
-      updateFontSize();
-      resId = R.string.p_fontSize;
-    }
-    if (resId > 0) {
-      result.putBoolean(EXTRA_RESTART, true);
-      tracker.reportEvent(Tracking.Events.SET_PREFERENCE, resId, Integer.toString(value));
-    }
-  }
-
-  private void updateFontSize() {
-    findPreference(R.string.p_fontSize).setSummary(locale.formatNumber(preferences.getFontSize()));
-  }
-
-  private void updateRowPadding() {
-    findPreference(R.string.p_rowPadding)
-        .setSummary(locale.formatNumber(preferences.getRowPadding()));
-  }
-}
diff --git a/app/src/main/java/org/tasks/preferences/BasicPreferences.java b/app/src/main/java/org/tasks/preferences/BasicPreferences.java
index af7d5938d..bfee6efd3 100644
--- a/app/src/main/java/org/tasks/preferences/BasicPreferences.java
+++ b/app/src/main/java/org/tasks/preferences/BasicPreferences.java
@@ -6,6 +6,7 @@ import static java.util.Arrays.asList;
 import static org.tasks.PermissionUtil.verifyPermissions;
 import static org.tasks.dialogs.ExportTasksDialog.newExportTasksDialog;
 import static org.tasks.dialogs.ImportTasksDialog.newImportTasksDialog;
+import static org.tasks.dialogs.NativeSeekBarDialog.newSeekBarDialog;
 import static org.tasks.files.FileHelper.newFilePickerIntent;
 import static org.tasks.files.FileHelper.uri2String;
 import static org.tasks.locale.LocalePickerDialog.newLocalePickerDialog;
@@ -22,15 +23,19 @@ import android.preference.Preference;
 import android.preference.PreferenceScreen;
 import androidx.annotation.NonNull;
 import com.google.common.base.Strings;
+import com.todoroo.astrid.activity.BeastModePreferences;
+import com.todoroo.astrid.api.Filter;
 import com.todoroo.astrid.core.OldTaskPreferences;
 import com.todoroo.astrid.gtasks.auth.GtasksLoginActivity;
 import com.todoroo.astrid.reminders.ReminderPreferences;
 import java.util.List;
 import javax.inject.Inject;
 import org.tasks.BuildConfig;
+import org.tasks.LocalBroadcastManager;
 import org.tasks.R;
 import org.tasks.activities.ColorPickerActivity;
 import org.tasks.activities.ColorPickerActivity.ColorPalette;
+import org.tasks.activities.FilterSelectionActivity;
 import org.tasks.analytics.Tracker;
 import org.tasks.analytics.Tracking;
 import org.tasks.analytics.Tracking.Events;
@@ -38,6 +43,7 @@ import org.tasks.billing.BillingClient;
 import org.tasks.billing.Inventory;
 import org.tasks.billing.PurchaseActivity;
 import org.tasks.dialogs.DialogBuilder;
+import org.tasks.dialogs.NativeSeekBarDialog;
 import org.tasks.drive.DriveLoginActivity;
 import org.tasks.files.FileHelper;
 import org.tasks.gtasks.GoogleAccountManager;
@@ -54,12 +60,13 @@ import org.tasks.ui.SingleCheckedArrayAdapter;
 import org.tasks.ui.Toaster;
 
 public class BasicPreferences extends InjectingPreferenceActivity
-    implements LocalePickerDialog.LocaleSelectionHandler {
+    implements LocalePickerDialog.LocaleSelectionHandler, NativeSeekBarDialog.SeekBarCallback {
 
-  private static final String EXTRA_RESULT = "extra_result";
   private static final String FRAG_TAG_LOCALE_PICKER = "frag_tag_locale_picker";
   private static final String FRAG_TAG_IMPORT_TASKS = "frag_tag_import_tasks";
   private static final String FRAG_TAG_EXPORT_TASKS = "frag_tag_export_tasks";
+  private static final String FRAG_TAG_ROW_PADDING_SEEKBAR = "frag_tag_row_padding_seekbar";
+  private static final String FRAG_TAG_FONT_SIZE_SEEKBAR = "frag_tag_font_size_seekbar";
   private static final int RC_PREFS = 10001;
   private static final int REQUEST_THEME_PICKER = 10002;
   private static final int REQUEST_COLOR_PICKER = 10003;
@@ -68,6 +75,11 @@ public class BasicPreferences extends InjectingPreferenceActivity
   private static final int REQUEST_PICKER = 10006;
   private static final int REQUEST_LAUNCHER_PICKER = 10007;
   private static final int RC_DRIVE_BACKUP = 10008;
+  private static final int REQUEST_DEFAULT_LIST = 10009;
+  private static final int REQUEST_ROW_PADDING = 10010;
+  private static final int REQUEST_FONT_SIZE = 10011;
+  private static final int REQUEST_CUSTOMIZE = 10012;
+
   @Inject Tracker tracker;
   @Inject Preferences preferences;
   @Inject ThemeBase themeBase;
@@ -79,22 +91,77 @@ public class BasicPreferences extends InjectingPreferenceActivity
   @Inject Inventory inventory;
   @Inject PlayServices playServices;
   @Inject Toaster toaster;
-  @Inject Device device;
   @Inject ActivityPermissionRequestor permissionRequestor;
   @Inject GoogleAccountManager googleAccountManager;
   @Inject BillingClient billingClient;
-
-  private Bundle result;
+  @Inject DefaultFilterProvider defaultFilterProvider;
+  @Inject LocalBroadcastManager localBroadcastManager;
 
   @Override
   public void onCreate(Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
 
-    result = savedInstanceState == null ? new Bundle() : savedInstanceState.getBundle(EXTRA_RESULT);
-
     addPreferencesFromResource(R.xml.preferences);
 
-    setupActivity(R.string.EPr_appearance_header, AppearancePreferences.class);
+    setExtraOnChange(
+        EXTRA_RESTART,
+        R.string.p_fontSize,
+        R.string.p_rowPadding,
+        R.string.p_fullTaskTitle,
+        R.string.p_show_description,
+        R.string.p_show_full_description,
+        R.string.p_linkify_task_list,
+        R.string.p_show_list_indicators);
+
+    findPreference(getString(R.string.customize_edit_screen))
+        .setOnPreferenceClickListener(
+            preference -> {
+              startActivityForResult(
+                  new Intent(BasicPreferences.this, BeastModePreferences.class),
+                  REQUEST_CUSTOMIZE);
+              return true;
+            });
+
+    findPreference(R.string.p_fontSize)
+        .setOnPreferenceClickListener(
+            preference -> {
+              newSeekBarDialog(
+                  R.layout.dialog_font_size_seekbar,
+                  10,
+                  48,
+                  preferences.getFontSize(),
+                  REQUEST_FONT_SIZE)
+                  .show(getFragmentManager(), FRAG_TAG_FONT_SIZE_SEEKBAR);
+              return false;
+            });
+    updateFontSize();
+
+    findPreference(R.string.p_rowPadding)
+        .setOnPreferenceClickListener(
+            preference -> {
+              newSeekBarDialog(
+                  R.layout.dialog_font_size_seekbar,
+                  0,
+                  16,
+                  preferences.getRowPadding(),
+                  REQUEST_ROW_PADDING)
+                  .show(getFragmentManager(), FRAG_TAG_ROW_PADDING_SEEKBAR);
+              return false;
+            });
+    updateRowPadding();
+    Preference defaultList = findPreference(getString(R.string.p_default_list));
+    Filter filter = defaultFilterProvider.getDefaultFilter();
+    defaultList.setSummary(filter.listingTitle);
+    defaultList.setOnPreferenceClickListener(
+        preference -> {
+          Intent intent = new Intent(BasicPreferences.this, FilterSelectionActivity.class);
+          intent.putExtra(
+              FilterSelectionActivity.EXTRA_FILTER, defaultFilterProvider.getDefaultFilter());
+          intent.putExtra(FilterSelectionActivity.EXTRA_RETURN_FILTER, true);
+          startActivityForResult(intent, REQUEST_DEFAULT_LIST);
+          return true;
+        });
+
     setupActivity(R.string.notifications, ReminderPreferences.class);
     setupActivity(R.string.EPr_manage_header, OldTaskPreferences.class);
     setupActivity(R.string.debug, DebugPreferences.class);
@@ -378,12 +445,6 @@ public class BasicPreferences extends InjectingPreferenceActivity
             });
   }
 
-  @Override
-  protected void onSaveInstanceState(Bundle outState) {
-    super.onSaveInstanceState(outState);
-    outState.putBundle(EXTRA_RESULT, result);
-  }
-
   @Override
   public void onRequestPermissionsResult(
       int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
@@ -404,7 +465,7 @@ public class BasicPreferences extends InjectingPreferenceActivity
         preferences.setInt(R.string.p_theme, index);
         themeCache.getThemeBase(index).setDefaultNightMode();
         tracker.reportEvent(Tracking.Events.SET_THEME, Integer.toString(index));
-        result.putBoolean(AppearancePreferences.EXTRA_RESTART, true);
+        forceRestart();
         recreate();
       }
     } else if (requestCode == REQUEST_COLOR_PICKER) {
@@ -412,7 +473,7 @@ public class BasicPreferences extends InjectingPreferenceActivity
         int index = data.getIntExtra(ColorPickerActivity.EXTRA_THEME_INDEX, 0);
         preferences.setInt(R.string.p_theme_color, index);
         tracker.reportEvent(Tracking.Events.SET_COLOR, Integer.toString(index));
-        result.putBoolean(AppearancePreferences.EXTRA_RESTART, true);
+        forceRestart();
         recreate();
       }
     } else if (requestCode == REQUEST_ACCENT_PICKER) {
@@ -420,7 +481,7 @@ public class BasicPreferences extends InjectingPreferenceActivity
         int index = data.getIntExtra(ColorPickerActivity.EXTRA_THEME_INDEX, 0);
         preferences.setInt(R.string.p_theme_accent, index);
         tracker.reportEvent(Tracking.Events.SET_ACCENT, Integer.toString(index));
-        result.putBoolean(AppearancePreferences.EXTRA_RESTART, true);
+        forceRestart();
         recreate();
       }
     } else if (requestCode == REQUEST_LAUNCHER_PICKER) {
@@ -433,7 +494,7 @@ public class BasicPreferences extends InjectingPreferenceActivity
       }
     } else if (requestCode == RC_PREFS) {
       if (resultCode == Activity.RESULT_OK && data != null) {
-        result.putAll(data.getExtras());
+        mergeResults(data.getExtras());
       }
     } else if (requestCode == REQUEST_CODE_BACKUP_DIR) {
       if (resultCode == RESULT_OK && data != null) {
@@ -455,7 +516,7 @@ public class BasicPreferences extends InjectingPreferenceActivity
           toaster.longToast(R.string.invalid_backup_file);
         } else {
           newImportTasksDialog(uri, extension).show(getFragmentManager(), FRAG_TAG_IMPORT_TASKS);
-          result.putBoolean(AppearancePreferences.EXTRA_RESTART, true);
+          forceRestart();
         }
       }
     } else if (requestCode == RC_DRIVE_BACKUP) {
@@ -464,6 +525,17 @@ public class BasicPreferences extends InjectingPreferenceActivity
       if (!success && data != null) {
         toaster.longToast(data.getStringExtra(GtasksLoginActivity.EXTRA_ERROR));
       }
+    } else if (requestCode == REQUEST_DEFAULT_LIST) {
+      if (resultCode == RESULT_OK) {
+        Filter filter = data.getParcelableExtra(FilterSelectionActivity.EXTRA_FILTER);
+        defaultFilterProvider.setDefaultFilter(filter);
+        findPreference(getString(R.string.p_default_list)).setSummary(filter.listingTitle);
+        localBroadcastManager.broadcastRefresh();
+      }
+    } else if (requestCode == REQUEST_CUSTOMIZE) {
+      if (resultCode == RESULT_OK) {
+        forceRestart();
+      }
     } else {
       super.onActivityResult(requestCode, resultCode, data);
     }
@@ -490,15 +562,6 @@ public class BasicPreferences extends InjectingPreferenceActivity
     languagePreference.setSummary(locale.withLanguage(preference).getDisplayName());
   }
 
-  @Override
-  public void finish() {
-    Intent data = new Intent();
-    data.putExtras(result);
-    setResult(Activity.RESULT_OK, data);
-
-    super.finish();
-  }
-
   private void initializeBackupDirectory() {
     findPreference(getString(R.string.p_backup_dir))
         .setOnPreferenceClickListener(
@@ -529,6 +592,33 @@ public class BasicPreferences extends InjectingPreferenceActivity
     }
   }
 
+  private void updateFontSize() {
+    findPreference(R.string.p_fontSize).setSummary(locale.formatNumber(preferences.getFontSize()));
+  }
+
+  private void updateRowPadding() {
+    findPreference(R.string.p_rowPadding)
+        .setSummary(locale.formatNumber(preferences.getRowPadding()));
+  }
+
+  @Override
+  public void valueSelected(int value, int requestCode) {
+    int resId = 0;
+    if (requestCode == REQUEST_ROW_PADDING) {
+      preferences.setInt(R.string.p_rowPadding, value);
+      updateRowPadding();
+      resId = R.string.p_rowPadding;
+    } else if (requestCode == REQUEST_FONT_SIZE) {
+      preferences.setInt(R.string.p_fontSize, value);
+      updateFontSize();
+      resId = R.string.p_fontSize;
+    }
+    if (resId > 0) {
+      forceRestart();
+      tracker.reportEvent(Tracking.Events.SET_PREFERENCE, resId, Integer.toString(value));
+    }
+  }
+
   @Override
   public void inject(ActivityComponent component) {
     component.inject(this);
diff --git a/app/src/main/java/org/tasks/preferences/Preferences.java b/app/src/main/java/org/tasks/preferences/Preferences.java
index e0f3884a5..3baa768be 100644
--- a/app/src/main/java/org/tasks/preferences/Preferences.java
+++ b/app/src/main/java/org/tasks/preferences/Preferences.java
@@ -204,7 +204,6 @@ public class Preferences {
 
   public void setDefaults() {
     PreferenceManager.setDefaultValues(context, R.xml.preferences, true);
-    PreferenceManager.setDefaultValues(context, R.xml.preferences_appearance, true);
     PreferenceManager.setDefaultValues(context, R.xml.preferences_date_time, true);
     PreferenceManager.setDefaultValues(context, R.xml.preferences_defaults, true);
     PreferenceManager.setDefaultValues(context, R.xml.preferences_synchronization, true);
diff --git a/app/src/main/java/org/tasks/ui/NavigationDrawerFragment.java b/app/src/main/java/org/tasks/ui/NavigationDrawerFragment.java
index f08dd58b2..ac2571362 100644
--- a/app/src/main/java/org/tasks/ui/NavigationDrawerFragment.java
+++ b/app/src/main/java/org/tasks/ui/NavigationDrawerFragment.java
@@ -47,7 +47,7 @@ import org.tasks.filters.NavigationDrawerAction;
 import org.tasks.injection.FragmentComponent;
 import org.tasks.injection.InjectingFragment;
 import org.tasks.intents.TaskIntents;
-import org.tasks.preferences.AppearancePreferences;
+import org.tasks.preferences.BasicPreferences;
 
 public class NavigationDrawerFragment extends InjectingFragment {
 
@@ -95,7 +95,7 @@ public class NavigationDrawerFragment extends InjectingFragment {
   public void onActivityResult(int requestCode, int resultCode, Intent data) {
     if (requestCode == REQUEST_SETTINGS) {
       if (resultCode == Activity.RESULT_OK) {
-        if (data != null && data.getBooleanExtra(AppearancePreferences.EXTRA_RESTART, false)) {
+        if (data != null && data.getBooleanExtra(BasicPreferences.EXTRA_RESTART, false)) {
           getActivity().recreate();
         }
       }
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index 25e83562a..9e6e76bbd 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -45,8 +45,7 @@
 	<string name="CRA_ignore_this">تجاهل هذا الحدث فقط</string>
 	<string name="CRA_postpone">من المحتمل لاحقاً</string>
 	<string name="CRA_calendar_reminders_pref_desc_enabled">المهام سوف تذكرك في الاحداث القادمة وسوف تحثك لتكون جاهزاً.</string>
-	<string name="EPr_appearance_header">ظهور</string>
-	<string name="EPr_edit_screen_options">تعديل خيارات الشاشه</string>
+  <string name="EPr_edit_screen_options">تعديل خيارات الشاشه</string>
 	<string name="EPr_beastMode_reset">الإعادة إلى الإفتراضي</string>
 	<string name="EPr_fullTask_title">إظهار عنوان المهمه</string>
 	<string name="task_list_options">خيارات قائمة المهام</string>
diff --git a/app/src/main/res/values-bg-rBG/strings.xml b/app/src/main/res/values-bg-rBG/strings.xml
index 45d3ee6c5..612240f41 100644
--- a/app/src/main/res/values-bg-rBG/strings.xml
+++ b/app/src/main/res/values-bg-rBG/strings.xml
@@ -80,8 +80,7 @@
 	<string name="CRA_calendar_reminders_pref_desc_enabled">Tasks ще ви напомня за предстоящи събития в календара и ще ви подканва да се подготвите за тях</string>
 	<string name="CRA_default_list_name">Действия: %s</string>
 	<string name="none">Нищо</string>
-	<string name="EPr_appearance_header">Изглед</string>
-	<string name="EPr_filters_to_show_title">Филтри за показване</string>
+  <string name="EPr_filters_to_show_title">Филтри за показване</string>
 	<string name="EPr_edit_screen_options">Редактиране на опциите екрана</string>
 	<string name="EPr_beastMode_reset">Възстанови по подразбиране</string>
 	<string name="EPr_fullTask_title">Покажи пълното име на задачата</string>
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index 7ff07af4c..43b73edfc 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -43,8 +43,7 @@
 	<string name="TEA_control_timer">Controls de temporització</string>
 	<string name="TEA_control_hidden_section">----Oculta-ho sempre----</string>
 	<string name="TEA_load_more">Carrega més...</string>
-	<string name="EPr_appearance_header">Aparença</string>
-	<string name="EPr_beastMode_reset">Restableix els valors predeterminats</string>
+  <string name="EPr_beastMode_reset">Restableix els valors predeterminats</string>
 	<string name="EPr_fullTask_title">Mostra el títol sencer de la tasca</string>
 	<string name="EPr_manage_delete_completed_gcal_message">Segur que voleu suprimir els esdeveniments de calendari de les tasques completades?</string>
 	<string name="day_after_tomorrow">Demà passat</string>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 1052ab2a4..88a72b55b 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -66,8 +66,7 @@
 	<string name="CRA_calendar_reminders_pref_title">Asistent pro kalendář</string>
 	<string name="CRA_calendar_reminders_pref_desc_enabled">Úkoly budou připomínány jako událost v kalendáři a budete vyzváni, na jejich plnění.</string>
 	<string name="none">Žádný</string>
-	<string name="EPr_appearance_header">Vzhled</string>
-	<string name="EPr_filters_to_show_title">Filtry pro zobrazení</string>
+  <string name="EPr_filters_to_show_title">Filtry pro zobrazení</string>
 	<string name="EPr_edit_screen_options">Možnosti úprav zobrazení</string>
 	<string name="EPr_beastMode_reset">Obnovit výchozí hodnoty</string>
 	<string name="EPr_fullTask_title">Zobrazit úplný název úkolu</string>
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index 2d7a68da1..490f1dc51 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -39,8 +39,7 @@
     <string name="TEA_load_more">Indlæs flere...</string>
     <string name="CRA_ignore_all">Ignorér alle begivenheder</string>
     <string name="CRA_ignore_this">Ignorér kun denne begivenhed</string>
-    <string name="EPr_appearance_header">Udseende</string>
-    <string name="EPr_default_urgency_title">Standard Deadline</string>
+  <string name="EPr_default_urgency_title">Standard Deadline</string>
     <string name="EPr_default_importance_title">Standard Vigtighed</string>
     <string name="EPr_default_hideUntil_title">Standard Skjul Indtil</string>
     <string name="EPr_default_reminders_title">Standardpåmindelser</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 3acfe5dd9..52b2fa3a0 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -74,8 +74,7 @@
     <string name="CRA_calendar_reminders_pref_desc_enabled">Tasks wird Sie an zukünftige Kalenderterrmine erinnern und Sie auf die Vorbereitung hinweisen</string>
     <string name="CRA_default_list_name">Einzelaufgaben: %s</string>
     <string name="none">Keine</string>
-    <string name="EPr_appearance_header">Erscheinungsbild</string>
-    <string name="EPr_filters_to_show_title">Angezeigte Filter</string>
+  <string name="EPr_filters_to_show_title">Angezeigte Filter</string>
     <string name="EPr_edit_screen_options">Bildschirmeinstellungen bearbeiten</string>
     <string name="EPr_beastMode_reset">Auf Standardeinstellungen zurücksetzen</string>
     <string name="EPr_fullTask_title">Gesamten Aufgabentitel anzeigen</string>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index ef8de5cef..f56686c77 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -63,8 +63,7 @@
 	<string name="CRA_calendar_reminders_pref_title">Βοηθός ημερολογίου</string>
 	<string name="CRA_calendar_reminders_pref_desc_enabled">Η εφαρμογή θα σας υπενθυμίσει για επερχόμενα γεγονότα ημερολογίου και θα σας ειδοποιήσουν για να προετοιμαστείτε για αυτα</string>
 	<string name="CRA_default_list_name">Αντικείμενα ενεργειών: %s</string>
-	<string name="EPr_appearance_header">Εμφάνιση</string>
-	<string name="EPr_filters_to_show_title">Φίλτρα για εμφάνιση</string>
+  <string name="EPr_filters_to_show_title">Φίλτρα για εμφάνιση</string>
 	<string name="EPr_edit_screen_options">Επεξεργασία επιλογών εμφάνισης</string>
 	<string name="EPr_beastMode_reset">Επαναφορά προεπιλογών</string>
 	<string name="EPr_fullTask_title">Εμφάνισε πλήρη τίτλο εργασίας</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index f51afd944..3cedea28c 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -75,8 +75,7 @@
     <string name="CRA_calendar_reminders_pref_desc_enabled">Tasks le recordará los próximos eventos de calendario y le pedirá que se prepare para ellos</string>
     <string name="CRA_default_list_name">Acciones: %s</string>
     <string name="none">Ninguna</string>
-    <string name="EPr_appearance_header">Apariencia</string>
-    <string name="EPr_filters_to_show_title">Filtros a mostrar</string>
+  <string name="EPr_filters_to_show_title">Filtros a mostrar</string>
     <string name="EPr_edit_screen_options">Editar opciones de pantalla</string>
     <string name="EPr_beastMode_reset">Restablecer valores predeterminados</string>
     <string name="EPr_fullTask_title">Mostrar completo el título de la tarea</string>
diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml
index ef2c6f476..d052c3e29 100644
--- a/app/src/main/res/values-et/strings.xml
+++ b/app/src/main/res/values-et/strings.xml
@@ -55,7 +55,6 @@
   <string name="CRA_postpone">Võib-olla hiljem</string>
   <string name="CRA_calendar_reminders_pref_title">Kalendri assistent</string>
   <string name="none">Pole</string>
-  <string name="EPr_appearance_header">Välimus</string>
   <string name="EPr_filters_to_show_title">Näidatavad filtrid</string>
   <string name="EPr_edit_screen_options">Muutmise vaate valikud</string>
   <string name="EPr_beastMode_reset">Taasta vaikeväärtused</string>
diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml
index dcb274ff2..960bc5ba4 100644
--- a/app/src/main/res/values-eu/strings.xml
+++ b/app/src/main/res/values-eu/strings.xml
@@ -81,8 +81,7 @@
     <string name="CRA_calendar_reminders_pref_desc_enabled">Tasks aplikazioak egutegiko gertaerak gogorarazi egingo dizkizu hurbil daudenean horietarako prestatu zaitezen</string>
     <string name="CRA_default_list_name">Ekintzak: %s</string>
     <string name="none">Bat ere ez</string>
-    <string name="EPr_appearance_header">Itxura</string>
-    <string name="EPr_filters_to_show_title">Erakutsitako iragazkiak</string>
+  <string name="EPr_filters_to_show_title">Erakutsitako iragazkiak</string>
     <string name="EPr_edit_screen_options">Editatu pantailaren aukerak</string>
     <string name="EPr_beastMode_reset">Berrezarri lehenetsitakoak</string>
     <string name="EPr_fullTask_title">Erakutsi egitekoaren izenburu osoa</string>
diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml
index 8a5de94f8..385b6101f 100644
--- a/app/src/main/res/values-fa/strings.xml
+++ b/app/src/main/res/values-fa/strings.xml
@@ -57,8 +57,7 @@
 	<string name="CRA_postpone">شاید یعدا</string>
 	<string name="CRA_calendar_reminders_pref_title">دستیار تقویم</string>
 	<string name="none">هیچکدام</string>
-	<string name="EPr_appearance_header">ظاهر</string>
-	<string name="EPr_filters_to_show_title">فیلترها برای نمایش</string>
+  <string name="EPr_filters_to_show_title">فیلترها برای نمایش</string>
 	<string name="EPr_edit_screen_options">ویرایش تنظیمات صفحه</string>
 	<string name="EPr_beastMode_reset">برگرداندن به پیش فرض</string>
 	<string name="EPr_fullTask_title">نمایش عنوان کامل وظیفه</string>
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index cabcb3b9c..7f3ef8c91 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -73,8 +73,7 @@
     <string name="CRA_calendar_reminders_pref_desc_enabled">Tasks ilmoittaa tulevista kalenteritapahtumista ja kehottaa valmistautumaan niihin.</string>
     <string name="CRA_default_list_name">Tehtäviä listalla: %s</string>
     <string name="none">Ei mitään</string>
-    <string name="EPr_appearance_header">Ulkoasu</string>
-    <string name="EPr_filters_to_show_title">Näytettävät suodattimet</string>
+  <string name="EPr_filters_to_show_title">Näytettävät suodattimet</string>
     <string name="EPr_edit_screen_options">Muokkaa näytön vaihtoehtoja</string>
     <string name="EPr_beastMode_reset">Palauta oletukset</string>
     <string name="EPr_fullTask_title">Näytä tehtävän koko otsikko</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index c46295b47..79e0ee501 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -74,8 +74,7 @@
     <string name="CRA_calendar_reminders_pref_desc_enabled">Tasks émettra un rappel au sujet des prochains événements et vous proposera de vous y préparer</string>
     <string name="CRA_default_list_name">Choix d\'actions: %s</string>
     <string name="none">Aucun</string>
-    <string name="EPr_appearance_header">Apparence</string>
-    <string name="EPr_filters_to_show_title">Filtres à afficher</string>
+  <string name="EPr_filters_to_show_title">Filtres à afficher</string>
     <string name="EPr_edit_screen_options">Edition des options d\'affichage</string>
     <string name="EPr_beastMode_reset">Rétablir les valeurs par défaut</string>
     <string name="EPr_fullTask_title">Voir le titre complet de la tâche</string>
diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml
index e64308d21..eeb6e2780 100644
--- a/app/src/main/res/values-gl/strings.xml
+++ b/app/src/main/res/values-gl/strings.xml
@@ -69,8 +69,7 @@
 	<string name="CRA_calendar_reminders_pref_desc_enabled">Tasks le recordará los próximos eventos de calendario y le pedirá que se prepare para ellos</string>
 	<string name="CRA_default_list_name">Acciones: %s</string>
 	<string name="none">Ninguna</string>
-	<string name="EPr_appearance_header">Apariencia</string>
-	<string name="EPr_filters_to_show_title">Filtros a mostrar</string>
+  <string name="EPr_filters_to_show_title">Filtros a mostrar</string>
 	<string name="EPr_edit_screen_options">Editar opciones de pantalla</string>
 	<string name="EPr_beastMode_reset">Restablecer valores predeterminados</string>
 	<string name="EPr_fullTask_title">Mostrar completo el título de la tarea</string>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 05eb979d4..709a2587d 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -79,8 +79,7 @@
     <string name="CRA_calendar_reminders_pref_desc_enabled">A Tasks emlékeztetni fog a közelgő naptáreseményekre, és a felkészülésre</string>
     <string name="CRA_default_list_name">Akciópontok: %s</string>
     <string name="none">Nincs</string>
-    <string name="EPr_appearance_header">Megjelenés</string>
-    <string name="EPr_filters_to_show_title">Megjelenítendő szűrők</string>
+  <string name="EPr_filters_to_show_title">Megjelenítendő szűrők</string>
     <string name="EPr_edit_screen_options">Szerkesztési képernyő beállításai</string>
     <string name="EPr_beastMode_reset">Visszaállítás alapértékre</string>
     <string name="EPr_fullTask_title">Feladat teljes nevének megjelenítése</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 5042df76a..e2230e113 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -77,8 +77,7 @@
 	<string name="CRA_calendar_reminders_pref_desc_enabled">Tasks non ti avviserà dei prossimi eventi in calendario</string>
 	<string name="CRA_default_list_name">Azioni: %s</string>
 	<string name="none">Nessuna</string>
-	<string name="EPr_appearance_header">Aspetto</string>
-	<string name="EPr_filters_to_show_title">Filtri da visualizzare</string>
+  <string name="EPr_filters_to_show_title">Filtri da visualizzare</string>
 	<string name="EPr_edit_screen_options">Modifica opzioni schermo</string>
 	<string name="EPr_beastMode_reset">Ripristina predefiniti</string>
 	<string name="EPr_fullTask_title">Visualizza titolo completo dell\'attività</string>
diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml
index 6b11351c0..0c1f87f55 100644
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@@ -82,8 +82,7 @@
     <string name="CRA_calendar_reminders_pref_desc_enabled">אסטריד תזכיר לך אירועי יומן עתידיים ותעודד אותך להתכונן אליהם</string>
     <string name="CRA_default_list_name">פריטי פעולה: %s</string>
     <string name="none">ללא</string>
-    <string name="EPr_appearance_header">חזות</string>
-    <string name="EPr_filters_to_show_title">אילו מַסְנְנִים להציג</string>
+  <string name="EPr_filters_to_show_title">אילו מַסְנְנִים להציג</string>
     <string name="EPr_edit_screen_options">עריכת אפשרויות מסך</string>
     <string name="EPr_beastMode_reset">אפס להגדרות ברירת מחדל</string>
     <string name="EPr_fullTask_title">הצג כותרת מלאה</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index add4f93e0..3cbbdbe40 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -77,8 +77,7 @@
     <string name="CRA_calendar_reminders_pref_desc_enabled">Tasks は近づいているカレンダーイベントを通知して準備するように促します</string>
     <string name="CRA_default_list_name">アクションアイテム: %s</string>
     <string name="none">なし</string>
-    <string name="EPr_appearance_header">外観</string>
-    <string name="EPr_filters_to_show_title">表示のフィルター</string>
+  <string name="EPr_filters_to_show_title">表示のフィルター</string>
     <string name="EPr_edit_screen_options">編集画面オプション</string>
     <string name="EPr_beastMode_reset">デフォルトにリセット</string>
     <string name="EPr_fullTask_title">完全なタスク見出しを表示</string>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index bccbc0274..d3c1484d1 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -80,8 +80,7 @@
 	<string name="CRA_calendar_reminders_pref_desc_enabled">Tasks는 다가오는 달력 이벤트를 알리고 당신이 준비하도록 할 것입니다</string>
 	<string name="CRA_default_list_name">활동 아이템: %s</string>
 	<string name="none">없음</string>
-	<string name="EPr_appearance_header">보기 설정</string>
-	<string name="EPr_filters_to_show_title">표시할 필터</string>
+  <string name="EPr_filters_to_show_title">표시할 필터</string>
 	<string name="EPr_edit_screen_options">화면 설정 편집하기</string>
 	<string name="EPr_beastMode_reset">기본값으로 초기화하기</string>
 	<string name="EPr_fullTask_title">할일 제목 전체 보기</string>
diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml
index f77685d22..f1a0acf92 100644
--- a/app/src/main/res/values-lt/strings.xml
+++ b/app/src/main/res/values-lt/strings.xml
@@ -77,8 +77,7 @@
 	<string name="CRA_calendar_reminders_pref_desc_enabled">Tasks programa primins apie artėjančius kalendoriaus įvykius ir pasiūlys jiems pasiruošti</string>
 	<string name="CRA_default_list_name">Veiksmų punktas: %s</string>
 	<string name="none">Nėra</string>
-	<string name="EPr_appearance_header">Išvaizda</string>
-	<string name="EPr_filters_to_show_title">Kuriuos filtrus rodyti</string>
+  <string name="EPr_filters_to_show_title">Kuriuos filtrus rodyti</string>
 	<string name="EPr_edit_screen_options">Redaguoti ekrano opcijas</string>
 	<string name="EPr_beastMode_reset">Ištrinti numatytuosius</string>
 	<string name="EPr_fullTask_title">Rodyti visą užduoties pavadinimą</string>
diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml
index dc2a134ee..825cbd010 100644
--- a/app/src/main/res/values-nb/strings.xml
+++ b/app/src/main/res/values-nb/strings.xml
@@ -42,8 +42,7 @@
     <string name="TEA_control_files">Filer</string>
     <string name="TEA_control_reminders">Påminnelser</string>
     <string name="TEA_control_hidden_section">----Alltid skjul----</string>
-    <string name="EPr_appearance_header">Utseende</string>
-    <string name="EPr_default_urgency_title">Forvalgsfrist</string>
+  <string name="EPr_default_urgency_title">Forvalgsfrist</string>
     <string name="EPr_default_importance_title">Forvalgsprioritert</string>
     <string name="EPr_default_hideUntil_title">Forvalgt skjuling til</string>
     <string name="EPr_default_reminders_title">Forvalgte påminnelser</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 42a804293..b6554af79 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -75,8 +75,7 @@
     <string name="CRA_calendar_reminders_pref_desc_enabled">Tasks herinnert je aan aankomende agenda gebeurtenissen en fluistert je in je voor te bereiden</string>
     <string name="CRA_default_list_name">Actie-items: %s</string>
     <string name="none">Geen</string>
-    <string name="EPr_appearance_header">Uiterlijk</string>
-    <string name="EPr_filters_to_show_title">Te tonen filters</string>
+  <string name="EPr_filters_to_show_title">Te tonen filters</string>
     <string name="EPr_edit_screen_options">Scherm opties bewerken</string>
     <string name="EPr_beastMode_reset">Standaardinstellingen herstellen</string>
     <string name="EPr_fullTask_title">Laat volledige taak titel zien</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index f4d78ed52..91ab9453f 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -77,8 +77,7 @@
     <string name="CRA_calendar_reminders_pref_desc_enabled">Tasks będzie przypominał ci o nadchodzących wydarzeniach w kalendarzu oraz będzie nakłaniał do przygotowania się do nich</string>
     <string name="CRA_default_list_name">Wydarzenia aktywne: %s</string>
     <string name="none">Brak</string>
-    <string name="EPr_appearance_header">Wygląd</string>
-    <string name="EPr_filters_to_show_title">Pokazywane filtry</string>
+  <string name="EPr_filters_to_show_title">Pokazywane filtry</string>
     <string name="EPr_edit_screen_options">Edytuj ustawienia ekranu</string>
     <string name="EPr_beastMode_reset">Przywróć domyślne</string>
     <string name="EPr_fullTask_title">Pokaż pełną nazwę zadania</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index a4b7748f4..422789c02 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -78,8 +78,7 @@
 	<string name="CRA_calendar_reminders_pref_desc_enabled">O Tasks irá lembrá-lo de futuros eventos do calendário e te pedir para se preparar para eles</string>
 	<string name="CRA_default_list_name">Itens de ação: %s</string>
 	<string name="none">Nenhuma</string>
-	<string name="EPr_appearance_header">Aparência</string>
-	<string name="EPr_filters_to_show_title">Filtros a mostrar</string>
+  <string name="EPr_filters_to_show_title">Filtros a mostrar</string>
 	<string name="EPr_edit_screen_options">Opções da tela de edição</string>
 	<string name="EPr_beastMode_reset">Restaurar valores padrões</string>
 	<string name="EPr_fullTask_title">Exibir título completo da tarefa</string>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 3cbaebbfc..d873fac0a 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -71,8 +71,7 @@
     <string name="CRA_calendar_reminders_pref_desc_enabled">O Tasks irá lembra-lo sobre os próximos eventos de calendário e pedir a sua preparação</string>
     <string name="CRA_default_list_name">Itens de ação: %s</string>
     <string name="none">Nenhum</string>
-    <string name="EPr_appearance_header">Aspeto</string>
-    <string name="EPr_filters_to_show_title">Filtros a mostrar</string>
+  <string name="EPr_filters_to_show_title">Filtros a mostrar</string>
     <string name="EPr_edit_screen_options">Opções do ecrã de edição</string>
     <string name="EPr_beastMode_reset">Restaurar definições originas</string>
     <string name="EPr_fullTask_title">Mostrar título completo das tarefas</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 944d9f07b..da4961a85 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -76,8 +76,7 @@
     <string name="CRA_calendar_reminders_pref_desc_enabled">Tasks будет напоминать вам о предстоящих событиях в календаре и напомнит вам подготовиться к ним</string>
     <string name="CRA_default_list_name">Пункты события: %s</string>
     <string name="none">Нет</string>
-    <string name="EPr_appearance_header">Интерфейс</string>
-    <string name="EPr_filters_to_show_title">Показать фильтры</string>
+  <string name="EPr_filters_to_show_title">Показать фильтры</string>
     <string name="EPr_edit_screen_options">Редактировать настройки экрана</string>
     <string name="EPr_beastMode_reset">Сброс настроек</string>
     <string name="EPr_fullTask_title">Показывать полный заголовок задачи</string>
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index 472179040..cb83dcd9e 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -77,8 +77,7 @@
 	<string name="CRA_calendar_reminders_pref_desc_enabled">Úlohy vám pripomenú nadchádzajúce udalosti z kalendára a vyzvú vás, aby ste sa na ne pripravili.</string>
 	<string name="CRA_default_list_name">Položky akcie: %s</string>
 	<string name="none">Žiadna</string>
-	<string name="EPr_appearance_header">Vzhľad</string>
-	<string name="EPr_filters_to_show_title">Filtre pre zobrazenie</string>
+  <string name="EPr_filters_to_show_title">Filtre pre zobrazenie</string>
 	<string name="EPr_edit_screen_options">Možnosti úprav zobrazenia</string>
 	<string name="EPr_beastMode_reset">Obnoviť na predvolené</string>
 	<string name="EPr_fullTask_title">Zobraziť celý názov úlohy</string>
diff --git a/app/src/main/res/values-sl-rSI/strings.xml b/app/src/main/res/values-sl-rSI/strings.xml
index f703dc439..f26aba1e9 100644
--- a/app/src/main/res/values-sl-rSI/strings.xml
+++ b/app/src/main/res/values-sl-rSI/strings.xml
@@ -63,8 +63,7 @@
     <string name="CRA_calendar_reminders_pref_title">Pomočnik za koledar</string>
     <string name="CRA_calendar_reminders_pref_desc_enabled">Aplikacija Opravki vas bo opominjala o prihajajočih dogodkih na koledarju in vas pozivala, da se nanje pripravite</string>
     <string name="CRA_default_list_name">Število izvedbenih opravil: %s</string>
-    <string name="EPr_appearance_header">Izgled</string>
-    <string name="EPr_filters_to_show_title">Filtri za prikaz</string>
+  <string name="EPr_filters_to_show_title">Filtri za prikaz</string>
     <string name="EPr_edit_screen_options">Uredi možnosti zaslona</string>
     <string name="EPr_beastMode_reset">Povrni privzeto nastavitev</string>
     <string name="EPr_fullTask_title">Prikaži celoten naziv opravka</string>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index fa57c78d0..48cee3699 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -69,8 +69,7 @@
     <string name="CRA_calendar_reminders_pref_desc_enabled">Tasks kommer att påminna om kommande kalenderhändelser och uppmana dig att förbereda dem</string>
     <string name="CRA_default_list_name">Saker att göra: %s</string>
     <string name="none">Ingen</string>
-    <string name="EPr_appearance_header">Utseende</string>
-    <string name="EPr_filters_to_show_title">Filter att visa</string>
+  <string name="EPr_filters_to_show_title">Filter att visa</string>
     <string name="EPr_edit_screen_options">Ändra skärminställningar</string>
     <string name="EPr_beastMode_reset">Återställ till standardvärden</string>
     <string name="EPr_fullTask_title">Visa hela namnet på uppgiften</string>
diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml
index dd7d69a7d..5b6b136bc 100644
--- a/app/src/main/res/values-th/strings.xml
+++ b/app/src/main/res/values-th/strings.xml
@@ -18,8 +18,7 @@
 	<string name="TEA_note_label">บันทึกย่อ</string>
 	<string name="TEA_control_importance">ความสำคัญ</string>
 	<string name="TEA_control_notes">บันทึกย่อ</string>
-	<string name="EPr_appearance_header">รูปโฉม</string>
-	<string name="BFE_Active">แผนงานตอนนี้</string>
+  <string name="BFE_Active">แผนงานตอนนี้</string>
 	<string name="BFE_Recent">เพิ่งถูกแก้ไข</string>
 	<string name="CFA_universe_all">แผนงานตอนนี้</string>
 	<string name="CFA_type_add">หรือ</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 77deb9f73..583052f49 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -81,8 +81,7 @@
 	<string name="CRA_calendar_reminders_pref_desc_enabled">Tasks gelecek takvim etkinliklerini size hatırlatacak ve bu etkinliklere hazırlanmanız için size bilgilendirmede bulunacak. </string>
 	<string name="CRA_default_list_name">Eylem Ögeleri: %s</string>
 	<string name="none">Hiçbiri</string>
-	<string name="EPr_appearance_header">Görünüm</string>
-	<string name="EPr_filters_to_show_title">Gösterilecek süzgeçler</string>
+  <string name="EPr_filters_to_show_title">Gösterilecek süzgeçler</string>
 	<string name="EPr_edit_screen_options">Düzenleme ekranı ayarları</string>
 	<string name="EPr_beastMode_reset">Öntanımlılara sıfırla</string>
 	<string name="EPr_fullTask_title">Tüm görev başlığını göster</string>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index f4fe19f76..020a54290 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -80,8 +80,7 @@
     <string name="CRA_calendar_reminders_pref_desc_enabled">Tasks нагадає вам про майбутні календарні події і запропонує приготуватися до них</string>
     <string name="CRA_default_list_name">Список дій: %s</string>
     <string name="none">Жодного</string>
-    <string name="EPr_appearance_header">Вигляд</string>
-    <string name="EPr_filters_to_show_title">Показати фільтри</string>
+  <string name="EPr_filters_to_show_title">Показати фільтри</string>
     <string name="EPr_edit_screen_options">Редагувати налаштування екрану</string>
     <string name="EPr_beastMode_reset">Налаштування за замовчуванням</string>
     <string name="EPr_fullTask_title">Показувати повну назву завдання</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index ca932a1ea..ab9984c01 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -75,8 +75,7 @@
     <string name="CRA_calendar_reminders_pref_desc_enabled">Tasks将会提醒你即将到来的日历事件，并提示你为他们做准备</string>
     <string name="CRA_default_list_name">行动项目：%s</string>
     <string name="none">无</string>
-    <string name="EPr_appearance_header">外观</string>
-    <string name="EPr_filters_to_show_title">要显示的过滤器</string>
+  <string name="EPr_filters_to_show_title">要显示的过滤器</string>
     <string name="EPr_edit_screen_options">编辑屏幕选项</string>
     <string name="EPr_beastMode_reset">恢复默认值</string>
     <string name="EPr_fullTask_title">显示完整的任务标题</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 077939cd2..6d49dd207 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -59,8 +59,7 @@
 	<string name="CRA_calendar_reminders_pref_desc_enabled">Tasks會提醒您關於月曆上將要到來的事件，並且會提示您做好準備。</string>
 	<string name="CRA_default_list_name">行動事項：%s</string>
 	<string name="none">無</string>
-	<string name="EPr_appearance_header">外觀</string>
-	<string name="EPr_edit_screen_options">編輯畫面選項</string>
+  <string name="EPr_edit_screen_options">編輯畫面選項</string>
 	<string name="EPr_beastMode_reset">恢復預設值</string>
 	<string name="EPr_fullTask_title">顯示完整的任務工作標題</string>
 	<string name="EPr_show_task_edit_comments">在工作編輯介面顯示註解</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 0209120b6..42c24637f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -84,7 +84,6 @@ File %1$s contained %2$s.\n\n
   <string name="CRA_calendar_reminders_pref_desc_enabled">Tasks will remind you about upcoming calendar events and prompt you to prepare for them</string>
   <string name="CRA_default_list_name">Action Items: %s</string>
   <string name="none">None</string>
-  <string name="EPr_appearance_header">Appearance</string>
   <string name="EPr_filters_to_show_title">Filters to show</string>
   <string name="EPr_edit_screen_options">Edit screen options</string>
   <string name="EPr_beastMode_reset">Reset to defaults</string>
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index f61f1b140..db428634b 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -22,24 +22,82 @@
 
   </PreferenceCategory>
 
-  <PreferenceCategory
-    android:key="@string/settings_general"
-    android:title="@string/settings_general">
+  <PreferenceCategory android:title="@string/task_list_options">
+
+    <com.todoroo.astrid.ui.MultilinePreference
+      android:key="@string/p_default_list"
+      android:title="@string/default_list"/>
 
     <Preference
-      android:key="@string/EPr_appearance_header"
-      android:title="@string/EPr_appearance_header"/>
+      android:defaultValue="16"
+      android:key="@string/p_fontSize"
+      android:title="@string/font_size"/>
 
     <Preference
-      android:key="@string/notifications"
-      android:title="@string/notifications"/>
+      android:defaultValue="16"
+      android:key="@string/p_rowPadding"
+      android:title="@string/row_spacing"/>
+
+    <com.todoroo.astrid.ui.MultilineCheckboxPreference
+      android:defaultValue="false"
+      android:key="@string/p_fullTaskTitle"
+      android:title="@string/EPr_fullTask_title"/>
+
+    <CheckBoxPreference
+      android:defaultValue="true"
+      android:key="@string/p_show_description"
+      android:title="@string/show_description" />
+
+    <CheckBoxPreference
+      android:defaultValue="false"
+      android:key="@string/p_show_full_description"
+      android:dependency="@string/p_show_description"
+      android:title="@string/show_full_description" />
+
+    <CheckBoxPreference
+      android:defaultValue="true"
+      android:key="@string/p_show_list_indicators"
+      android:title="@string/show_list_indicators" />
+
+    <CheckBoxPreference
+      android:defaultValue="false"
+      android:key="@string/p_linkify_task_list"
+      android:title="@string/linkify"
+      android:summary="@string/linkify_description"/>
+
+  </PreferenceCategory>
 
+  <PreferenceCategory android:title="@string/EPr_edit_screen_options">
     <Preference android:title="@string/task_defaults">
       <intent
         android:targetClass="com.todoroo.astrid.core.DefaultsPreferences"
         android:targetPackage="@string/app_package"/>
     </Preference>
 
+    <Preference
+      android:key="@string/customize_edit_screen"
+      android:title="@string/customize_edit_screen"/>
+
+    <com.todoroo.astrid.ui.MultilineCheckboxPreference
+      android:defaultValue="false"
+      android:key="@string/p_back_button_saves_task"
+      android:title="@string/back_button_saves_task"/>
+
+    <com.todoroo.astrid.ui.MultilineCheckboxPreference
+      android:defaultValue="false"
+      android:key="@string/p_show_task_edit_comments"
+      android:title="@string/EPr_show_task_edit_comments"/>
+
+  </PreferenceCategory>
+
+  <PreferenceCategory
+    android:key="@string/settings_general"
+    android:title="@string/settings_general">
+
+    <Preference
+      android:key="@string/notifications"
+      android:title="@string/notifications"/>
+
     <Preference android:title="@string/date_and_time">
       <intent
         android:targetClass="org.tasks.preferences.DateTimePreferences"
@@ -105,6 +163,21 @@
 
   </PreferenceCategory>
 
+  <PreferenceCategory android:title="@string/EPr_filters_to_show_title">
+    <com.todoroo.astrid.ui.MultilineCheckboxPreference
+      android:defaultValue="true"
+      android:key="@string/p_show_today_filter"
+      android:title="@string/today"/>
+    <com.todoroo.astrid.ui.MultilineCheckboxPreference
+      android:defaultValue="true"
+      android:key="@string/p_show_recently_modified_filter"
+      android:title="@string/BFE_Recent"/>
+    <com.todoroo.astrid.ui.MultilineCheckboxPreference
+      android:defaultValue="true"
+      android:key="@string/p_show_not_in_list_filter"
+      android:title="@string/tag_FEx_untagged"/>
+  </PreferenceCategory>
+
   <PreferenceCategory
     android:key="@string/settings_localization"
     android:title="@string/settings_localization">
diff --git a/app/src/main/res/xml/preferences_appearance.xml b/app/src/main/res/xml/preferences_appearance.xml
deleted file mode 100644
index 5a04162f2..000000000
--- a/app/src/main/res/xml/preferences_appearance.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-  android:title="@string/EPr_appearance_header">
-
-  <PreferenceCategory android:title="@string/task_list_options">
-
-    <com.todoroo.astrid.ui.MultilinePreference
-      android:key="@string/p_default_list"
-      android:title="@string/default_list"/>
-
-    <Preference
-      android:defaultValue="16"
-      android:key="@string/p_fontSize"
-      android:title="@string/font_size"/>
-
-    <Preference
-      android:defaultValue="16"
-      android:key="@string/p_rowPadding"
-      android:title="@string/row_spacing"/>
-
-    <com.todoroo.astrid.ui.MultilineCheckboxPreference
-      android:defaultValue="false"
-      android:key="@string/p_fullTaskTitle"
-      android:title="@string/EPr_fullTask_title"/>
-
-    <CheckBoxPreference
-      android:defaultValue="true"
-      android:key="@string/p_show_description"
-      android:title="@string/show_description" />
-
-    <CheckBoxPreference
-      android:defaultValue="false"
-      android:key="@string/p_show_full_description"
-      android:dependency="@string/p_show_description"
-      android:title="@string/show_full_description" />
-
-    <CheckBoxPreference
-      android:defaultValue="true"
-      android:key="@string/p_show_list_indicators"
-      android:title="@string/show_list_indicators" />
-
-    <CheckBoxPreference
-      android:defaultValue="false"
-      android:key="@string/p_linkify_task_list"
-      android:title="@string/linkify"
-      android:summary="@string/linkify_description"/>
-
-  </PreferenceCategory>
-
-  <PreferenceCategory android:title="@string/EPr_edit_screen_options">
-    <Preference
-      android:key="@string/customize_edit_screen"
-      android:title="@string/customize_edit_screen"/>
-
-    <com.todoroo.astrid.ui.MultilineCheckboxPreference
-      android:defaultValue="false"
-      android:key="@string/p_back_button_saves_task"
-      android:title="@string/back_button_saves_task"/>
-
-    <com.todoroo.astrid.ui.MultilineCheckboxPreference
-      android:defaultValue="false"
-      android:key="@string/p_show_task_edit_comments"
-      android:title="@string/EPr_show_task_edit_comments"/>
-
-  </PreferenceCategory>
-
-  <PreferenceCategory android:title="@string/EPr_filters_to_show_title">
-    <com.todoroo.astrid.ui.MultilineCheckboxPreference
-      android:defaultValue="true"
-      android:key="@string/p_show_today_filter"
-      android:title="@string/today"/>
-    <com.todoroo.astrid.ui.MultilineCheckboxPreference
-      android:defaultValue="true"
-      android:key="@string/p_show_recently_modified_filter"
-      android:title="@string/BFE_Recent"/>
-    <com.todoroo.astrid.ui.MultilineCheckboxPreference
-      android:defaultValue="true"
-      android:key="@string/p_show_not_in_list_filter"
-      android:title="@string/tag_FEx_untagged"/>
-  </PreferenceCategory>
-
-</PreferenceScreen>