diff --git a/src/main/java/com/google/android/apps/mytracks/TrackListActivity.java b/src/main/java/com/google/android/apps/mytracks/TrackListActivity.java
index fa6d1c44d..0ac762695 100644
--- a/src/main/java/com/google/android/apps/mytracks/TrackListActivity.java
+++ b/src/main/java/com/google/android/apps/mytracks/TrackListActivity.java
@@ -487,9 +487,8 @@ public class TrackListActivity extends AbstractTrackActivity implements FileType
         intent = IntentUtils.newIntent(this, SettingsActivity.class);
         startActivity(intent);
         return true;
-      default:
-        return super.onOptionsItemSelected(item);
     }
+    return super.onOptionsItemSelected(item);
   }
 
   @Override
diff --git a/src/main/java/com/google/android/apps/mytracks/settings/IntegerListPreference.java b/src/main/java/com/google/android/apps/mytracks/settings/IntegerListPreference.java
index 4fe0af3a0..f121ac51d 100644
--- a/src/main/java/com/google/android/apps/mytracks/settings/IntegerListPreference.java
+++ b/src/main/java/com/google/android/apps/mytracks/settings/IntegerListPreference.java
@@ -17,6 +17,7 @@
 package com.google.android.apps.mytracks.settings;
 
 import android.content.Context;
+import android.preference.ListPreference;
 import android.util.AttributeSet;
 
 /**
@@ -28,7 +29,8 @@ import android.util.AttributeSet;
  *
  * @author Rodrigo Damazio
  */
-public class IntegerListPreference extends MyTracksListPreference {
+@Deprecated
+public class IntegerListPreference extends ListPreference {
 
   public IntegerListPreference(Context context) {
     super(context);
diff --git a/src/main/java/com/google/android/apps/mytracks/settings/MyTracksListPreference.java b/src/main/java/com/google/android/apps/mytracks/settings/MyTracksListPreference.java
deleted file mode 100644
index be72f9a6d..000000000
--- a/src/main/java/com/google/android/apps/mytracks/settings/MyTracksListPreference.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright 2013 Google Inc.
- *
- * 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.
- */
-
-package com.google.android.apps.mytracks.settings;
-
-import com.google.android.apps.mytracks.util.DialogUtils;
-
-import android.content.Context;
-import android.os.Bundle;
-import android.preference.ListPreference;
-import android.util.AttributeSet;
-
-/**
- * My Tracks list preference.
- * 
- * @author Jimmy Shih
- */
-public class MyTracksListPreference extends ListPreference {
-
-  public MyTracksListPreference(Context context) {
-    super(context);
-  }
-  
-  public MyTracksListPreference(Context context, AttributeSet attrs) {
-    super(context, attrs);
-  }
-
-  @Override
-  protected void showDialog(Bundle state) {
-    super.showDialog(state);
-    DialogUtils.setDialogTitleDivider(getContext(), getDialog());
-  }
-}
diff --git a/src/main/res/xml/settings_chart.xml b/src/main/res/xml/settings_chart.xml
index a5270fc9d..cb75bf7ee 100644
--- a/src/main/res/xml/settings_chart.xml
+++ b/src/main/res/xml/settings_chart.xml
@@ -16,7 +16,7 @@ limitations under the License.
 -->
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
   android:title="@string/track_detail_chart_tab" >
-  <com.google.android.apps.mytracks.settings.MyTracksListPreference
+  <ListPreference
     android:defaultValue="@string/chart_x_axis_distance"
     android:key="@string/chart_x_axis_key"
     android:title="@string/settings_chart_x_axis" />
diff --git a/src/main/res/xml/settings_recording.xml b/src/main/res/xml/settings_recording.xml
index 03de33231..c2f508f12 100644
--- a/src/main/res/xml/settings_recording.xml
+++ b/src/main/res/xml/settings_recording.xml
@@ -24,12 +24,12 @@ limitations under the License.
     android:defaultValue="0"
     android:key="@string/split_frequency_key"
     android:title="@string/menu_split_frequency" />
-  <com.google.android.apps.mytracks.settings.MyTracksListPreference
+  <ListPreference
     android:defaultValue="@string/settings_recording_track_name_date_iso_8601_location_value"
     android:key="@string/track_name_key"
     android:title="@string/settings_recording_track_name_title" />
   <com.google.android.apps.mytracks.settings.ActivityTypePreference
-    android:defaultValue=""
+    android:defaultValue="@string/activity_type_running"
     android:key="@string/default_activity_key"
     android:title="@string/settings_recording_default_activity_title" />
   <com.google.android.apps.mytracks.settings.IntegerListPreference
diff --git a/src/main/res/xml/settings_sensors.xml b/src/main/res/xml/settings_sensors.xml
index ceac320e2..6ad37dd89 100644
--- a/src/main/res/xml/settings_sensors.xml
+++ b/src/main/res/xml/settings_sensors.xml
@@ -25,8 +25,8 @@ limitations under the License.
       android:persistent="false"
       android:summary="@string/settings_sensor_bluetooth_pairing_summary"
       android:title="@string/settings_sensor_bluetooth_pairing" />
-    <com.google.android.apps.mytracks.settings.MyTracksListPreference
-      android:defaultValue=""
+    <ListPreference
+      android:defaultValue="@string/sensor_type_value_none"
       android:key="@string/bluetooth_sensor_key"
       android:title="@string/settings_sensor_bluetooth_sensor" />
   </PreferenceCategory>
diff --git a/src/main/res/xml/settings_statistics.xml b/src/main/res/xml/settings_statistics.xml
index affcee983..6288de43d 100644
--- a/src/main/res/xml/settings_statistics.xml
+++ b/src/main/res/xml/settings_statistics.xml
@@ -16,11 +16,11 @@ limitations under the License.
 -->
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
   android:title="@string/track_detail_stats_tab" >
-  <com.google.android.apps.mytracks.settings.MyTracksListPreference
+  <ListPreference
     android:defaultValue="@string/stats_units_metric"
     android:key="@string/stats_units_key"
     android:title="@string/settings_stats_units_title" />
-  <com.google.android.apps.mytracks.settings.MyTracksListPreference
+  <ListPreference
     android:defaultValue="@string/stats_rate_speed"
     android:key="@string/stats_rate_key"
     android:title="@string/settings_stats_rate_title" />