diff --git a/app/src/main/java/com/nutomic/syncthingandroid/activities/SettingsActivity.java b/app/src/main/java/com/nutomic/syncthingandroid/activities/SettingsActivity.java
index 7dba1dc1..47c7bf9f 100644
--- a/app/src/main/java/com/nutomic/syncthingandroid/activities/SettingsActivity.java
+++ b/app/src/main/java/com/nutomic/syncthingandroid/activities/SettingsActivity.java
@@ -294,7 +294,7 @@ public class SettingsActivity extends SyncthingActivity {
                 final int itemsCount = listAdapter.getCount();
                 for (int itemNumber = 0; itemNumber < itemsCount; ++itemNumber) {
                     if (listAdapter.getItem(itemNumber).equals(categoryRunConditions)) {
-                        //simulates click on the sub-preference
+                        // Simulates click on the sub-preference
                         prefScreen.onItemClick(null, null, itemNumber, 0);
                         break;
                     }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index bcdb5249..07640f99 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -294,16 +294,16 @@ Please report any problems you encounter via Github.</string>
     <string name="sync_only_wifi_ssids">to_be_deleted</string>
 
     <string name="run_conditions_title">Run Conditions</string>
-    <string name="run_conditions_summary">Use the following options to decide when the syncthing UI will be available and synchronization takes place.</string>
+    <string name="run_conditions_summary">Use the following options to decide when Syncthing will run.</string>
 
     <string name="run_on_mobile_data_title">Run on mobile data</string>
-    <string name="run_on_mobile_data_summary">Run when device is connected to the mobile data network. Attention: This can fastly consume your data plan if you sync a large amount of data.</string>
+    <string name="run_on_mobile_data_summary">Run when device is connected via the mobile data network. Warning: This can consume a lot of data from your mobile operator data plan if you sync large amounts of data.</string>
 
     <string name="run_on_wifi_title">Run on wifi</string>
     <string name="run_on_wifi_summary">Run when device is connected to a wifi network.</string>
 
     <string name="run_on_metered_wifi_title">Run on metered wifi</string>
-    <string name="run_on_metered_wifi_summary">Run when device is connected to a metered wifi network e.g. a hotspot or tethered network. Attention: This can fastly consume your data plan if you sync a large amount of data.</string>
+    <string name="run_on_metered_wifi_summary">Run when device is connected to a metered wifi network e.g. a hotspot or tethered network. Attention: This can consume large portion of your data plan if you sync a lot of data.</string>
 
     <string name="run_on_whitelisted_wifi_title">Run on specified wifi networks</string>
     <string name="run_on_whitelisted_wifi_networks">Run on selected wifi networks: %1$s</string>
@@ -325,16 +325,16 @@ Please report any problems you encounter via Github.</string>
     </string-array>
 
     <string name="respect_battery_saving_title">Respect Android battery saving setting</string>
-    <string name="respect_battery_saving_summary">Disable Syncthing if battery saving is active</string>
+    <string name="respect_battery_saving_summary">Disable Syncthing if battery saving is active.</string>
 
     <string name="respect_master_sync_title">Respect Android \'Auto-sync data\' setting</string>
     <string name="respect_master_sync_summary">Disable Syncthing when the quick settings tile \'Auto-sync data\' is toggled off.</string>
 
     <string name="run_in_flight_mode_title">Run when device is in flight mode</string>
-    <string name="run_in_flight_mode_summary">Enable if your phone has problems detecting manually connected wifi during flight mode.</string>
+    <string name="run_in_flight_mode_summary">Enable if your phone has problems detecting manual wifi connections during flight mode.</string>
 
     <string name="service_settings_title">Service setting</string>
-    <string name="service_settings_summary">Running Syncthing as a service adds a persistent notification to prevent it from being ended by android. Checking this option starts syncthing automatically when the phone boots.</string>
+    <string name="service_settings_summary">Run Syncthing as a service. Adds a persistent notification to prevent it from being terminated by Android. Checking this option starts Syncthing on operating system startup.</string>
 
     <string name="run_as_background_service">Run as background service</string>