diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 35ad3c6..2c2f891 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.traccar.client"
-    android:versionCode="7"
-    android:versionName="2.0">
+    android:versionCode="8"
+    android:versionName="2.1">
     
     <uses-sdk android:minSdkVersion="4" android:targetSdkVersion="17" />
     
diff --git a/res/xml-v14/preferences.xml b/res/xml-v14/preferences.xml
index 3cb1472..e4bcfa6 100644
--- a/res/xml-v14/preferences.xml
+++ b/res/xml-v14/preferences.xml
@@ -36,9 +36,9 @@
     <SwitchPreference
         android:key="status"
         android:title="@string/settings_status_title"
-        android:summaryOff="@string/settings_status_off_summary" 
-		android:summaryOn="@string/settings_status_on_summary" 
-		android:switchTextOff="@string/settings_status_off" 
+        android:summaryOff="@string/settings_status_off_summary"
+		android:summaryOn="@string/settings_status_on_summary"
+		android:switchTextOff="@string/settings_status_off"
 		android:switchTextOn="@string/settings_status_on"
         android:defaultValue="false" />
 
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index d0df23e..697fda6 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -36,8 +36,8 @@
     <CheckBoxPreference
         android:key="status"
         android:title="@string/settings_status_title"
-        android:summaryOff="@string/settings_status_off" 
-		android:summaryOn="@string/settings_status_on" 
+        android:summaryOff="@string/settings_status_off_summary"
+		android:summaryOn="@string/settings_status_on_summary"
         android:defaultValue="false" />
 
 </PreferenceScreen>