diff --git a/src/main/res/values/themes_custom.xml b/src/main/res/values/themes_custom.xml
index 01ab82ba5..b913d67c0 100644
--- a/src/main/res/values/themes_custom.xml
+++ b/src/main/res/values/themes_custom.xml
@@ -31,6 +31,7 @@ limitations under the License.
         <!--        <item name="colorPrimary">TODO</item>-->
         <!--        <item name="colorPrimaryDark">TODO</item>-->
 
+        <item name="colorAccent">@color/holo_orange_dark</item>
         <item name="android:colorAccent">@color/holo_orange_dark</item>
         <item name="windowActionModeOverlay">true</item>
     </style>
diff --git a/src/main/res/xml/settings.xml b/src/main/res/xml/settings.xml
index 20a952346..d677f91a7 100644
--- a/src/main/res/xml/settings.xml
+++ b/src/main/res/xml/settings.xml
@@ -43,23 +43,25 @@ limitations under the License.
     </PreferenceCategory>
 
     <PreferenceCategory android:title="@string/settings_show">
-        <CheckBoxPreference
+        <SwitchPreferenceCompat
             android:defaultValue="@bool/stats_show_grade_elevation_default"
             android:key="@string/stats_show_grade_elevation_key"
             android:title="@string/settings_stats_grade_elevation" />
-        <CheckBoxPreference
+        <SwitchPreferenceCompat
             android:defaultValue="@bool/stats_show_coordinate_default"
             android:key="@string/stats_show_coordinate_key"
             android:title="@string/settings_stats_coordinate" />
     </PreferenceCategory>
 
-    <PreferenceCategory android:title="@string/settings_recording">
-        <CheckBoxPreference
+    <PreferenceCategory
+        android:title="@string/settings_recording"
+        app:initialExpandedChildrenCount="4">
+        <SwitchPreferenceCompat
             android:defaultValue="@bool/stats_show_on_lockscreen_while_recording_default"
             android:key="@string/stats_show_on_lockscreen_while_recording_key"
             android:summary="@string/settings_recording_show_on_lockscreen_while_recording_summary"
             android:title="@string/settings_recording_show_on_lockscreen_while_recording_title" />
-        <CheckBoxPreference
+        <SwitchPreferenceCompat
             android:defaultValue="@bool/stats_keep_screen_on_while_recording_default"
             android:key="@string/stats_keep_screen_on_while_recording_key"
             android:summary="@string/settings_recording_keep_screen_on_while_recording_summary"
@@ -70,6 +72,10 @@ limitations under the License.
             android:key="@string/voice_frequency_key"
             android:title="@string/menu_voice_frequency"
             app:useSimpleSummaryProvider="true" />
+        <de.dennisguse.opentracks.settings.ActivityTypePreference
+            android:defaultValue="@string/default_activity_default"
+            android:key="@string/default_activity_key"
+            android:title="@string/settings_recording_default_activity_title" />
         <ListPreference
             android:defaultValue="@string/track_name_default"
             android:entries="@array/track_name_options"
@@ -101,10 +107,6 @@ limitations under the License.
             android:key="@string/recording_gps_accuracy_key"
             android:title="@string/settings_recording_min_required_accuracy_title"
             app:useSimpleSummaryProvider="true" />
-        <de.dennisguse.opentracks.settings.ActivityTypePreference
-            android:defaultValue="@string/default_activity_default"
-            android:key="@string/default_activity_key"
-            android:title="@string/settings_recording_default_activity_title" />
     </PreferenceCategory>
 
     <PreferenceCategory android:title="@string/settings_sensor_bluetooth">