diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 3284b3a02..569497aea 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1007,6 +1007,7 @@
     <string name="FetchActivityOperation_about_to_transfer_since">About to transfer data since %1$s</string>
     <string name="waiting_for_reconnect">Waiting for reconnect</string>
     <string name="activity_prefs_about_you">About you</string>
+    <string name="activity_prefs_goals">Goals</string>
     <string name="activity_prefs_year_birth">Year of birth</string>
     <string name="activity_prefs_gender">Gender</string>
     <string name="activity_prefs_height_cm">Height in cm</string>
diff --git a/app/src/main/res/xml/about_user.xml b/app/src/main/res/xml/about_user.xml
index b20bedae6..f3b292cd5 100644
--- a/app/src/main/res/xml/about_user.xml
+++ b/app/src/main/res/xml/about_user.xml
@@ -2,10 +2,12 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
     <PreferenceCategory
+        app:iconSpaceReserved="false"
         android:key="pref_category_activity_personal"
         android:title="@string/activity_prefs_about_you">
 
         <EditTextPreference
+            app:iconSpaceReserved="false"
             android:inputType="number"
             android:key="activity_user_year_of_birth"
             android:maxLength="4"
@@ -13,6 +15,7 @@
             app:useSimpleSummaryProvider="true" />
 
         <ListPreference
+            app:iconSpaceReserved="false"
             android:defaultValue="2"
             android:entries="@array/gender"
             android:entryValues="@array/gender_values"
@@ -22,6 +25,7 @@
 
         <!--TODO: support localized heights and weights -->
         <EditTextPreference
+            app:iconSpaceReserved="false"
             android:inputType="number"
             android:key="activity_user_height_cm"
             android:maxLength="3"
@@ -29,6 +33,7 @@
             app:useSimpleSummaryProvider="true" />
 
         <EditTextPreference
+            app:iconSpaceReserved="false"
             android:inputType="number"
             android:key="activity_user_weight_kg"
             android:maxLength="3"
@@ -36,6 +41,22 @@
             app:useSimpleSummaryProvider="true" />
 
         <EditTextPreference
+            app:iconSpaceReserved="false"
+            android:inputType="number"
+            android:key="activity_user_step_length_cm"
+            android:maxLength="3"
+            android:title="@string/activity_prefs_step_length_cm"
+            app:useSimpleSummaryProvider="true" />
+
+    </PreferenceCategory>
+
+    <PreferenceCategory
+        app:iconSpaceReserved="false"
+        android:key="pref_category_targets"
+        android:title="@string/activity_prefs_goals">
+
+        <EditTextPreference
+            app:iconSpaceReserved="false"
             android:inputType="number"
             android:key="activity_user_goal_weight_kg"
             android:maxLength="3"
@@ -43,13 +64,7 @@
             app:useSimpleSummaryProvider="true" />
 
         <EditTextPreference
-            android:inputType="number"
-            android:key="activity_user_step_length_cm"
-            android:maxLength="3"
-            android:title="@string/activity_prefs_step_length_cm"
-            app:useSimpleSummaryProvider="true" />
-
-        <EditTextPreference
+            app:iconSpaceReserved="false"
             android:defaultValue="10000"
             android:inputType="number"
             android:key="fitness_goal"
@@ -58,6 +73,7 @@
             app:useSimpleSummaryProvider="true" />
 
         <EditTextPreference
+            app:iconSpaceReserved="false"
             android:inputType="number"
             android:key="activity_user_sleep_duration"
             android:maxLength="2"
@@ -65,6 +81,7 @@
             app:useSimpleSummaryProvider="true" />
 
         <EditTextPreference
+            app:iconSpaceReserved="false"
             android:defaultValue="2000"
             android:inputType="number"
             android:key="activity_user_calories_burnt"
@@ -73,6 +90,7 @@
             app:useSimpleSummaryProvider="true" />
 
         <EditTextPreference
+            app:iconSpaceReserved="false"
             android:defaultValue="5000"
             android:inputType="number"
             android:key="activity_user_distance_meters"
@@ -81,6 +99,7 @@
             app:useSimpleSummaryProvider="true" />
 
         <EditTextPreference
+            app:iconSpaceReserved="false"
             android:defaultValue="60"
             android:inputType="number"
             android:key="activity_user_activetime_minutes"
@@ -89,6 +108,7 @@
             app:useSimpleSummaryProvider="true" />
 
         <EditTextPreference
+            app:iconSpaceReserved="false"
             android:defaultValue="12"
             android:inputType="number"
             android:key="activity_user_goal_standing_time_minutes"
@@ -97,6 +117,7 @@
             app:useSimpleSummaryProvider="true" />
 
         <EditTextPreference
+            app:iconSpaceReserved="false"
             android:defaultValue="30"
             android:inputType="number"
             android:key="activity_user_goal_fat_burn_time_minutes"
diff --git a/app/src/main/res/xml/charts_preferences.xml b/app/src/main/res/xml/charts_preferences.xml
index 821446169..17eb110df 100644
--- a/app/src/main/res/xml/charts_preferences.xml
+++ b/app/src/main/res/xml/charts_preferences.xml
@@ -3,7 +3,8 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
     <PreferenceCategory
         android:key="pref_charts"
-        android:title="@string/activity_prefs_charts">
+        android:title="@string/activity_prefs_charts"
+        app:iconSpaceReserved="false">
 
         <EditTextPreference
             android:defaultValue="250"
@@ -11,6 +12,7 @@
             android:key="chart_max_heart_rate"
             android:maxLength="3"
             android:title="@string/activity_prefs_chart_max_heart_rate"
+            app:iconSpaceReserved="false"
             app:useSimpleSummaryProvider="true" />
 
         <EditTextPreference
@@ -19,6 +21,7 @@
             android:key="chart_min_heart_rate"
             android:maxLength="3"
             android:title="@string/activity_prefs_chart_min_heart_rate"
+            app:iconSpaceReserved="false"
             app:useSimpleSummaryProvider="true" />
 
         <SwitchPreference
@@ -26,36 +29,42 @@
             android:key="chart_heartrate_color"
             android:summaryOff="@string/pref_chart_heartrate_color_orange"
             android:summaryOn="@string/pref_chart_heartrate_color_red"
-            android:title="@string/pref_title_chart_heartrate_color" />
+            android:title="@string/pref_title_chart_heartrate_color"
+            app:iconSpaceReserved="false" />
 
         <SwitchPreference
             android:defaultValue="true"
             android:key="charts_allow_swipe"
-            android:title="@string/pref_title_charts_swipe" />
+            android:title="@string/pref_title_charts_swipe"
+            app:iconSpaceReserved="false" />
 
         <SwitchPreference
             android:defaultValue="false"
             android:key="chart_sleep_range_24h"
             android:summaryOff="@string/pref_chart_sleep_rolling_24_off"
             android:summaryOn="@string/pref_chart_sleep_rolling_24_on"
-            android:title="@string/pref_title_chart_sleep_rolling_24_hour" />
+            android:title="@string/pref_title_chart_sleep_rolling_24_hour"
+            app:iconSpaceReserved="false" />
 
         <SwitchPreference
             android:defaultValue="true"
             android:key="charts_show_average"
-            android:title="@string/pref_title_charts_average" />
+            android:title="@string/pref_title_charts_average"
+            app:iconSpaceReserved="false" />
 
         <SwitchPreference
             android:defaultValue="false"
             android:key="charts_range"
             android:summaryOff="@string/pref_charts_range_off"
             android:summaryOn="@string/pref_charts_range_on"
-            android:title="@string/pref_title_charts_range" />
+            android:title="@string/pref_title_charts_range"
+            app:iconSpaceReserved="false" />
 
         <SwitchPreference
             android:defaultValue="true"
             android:key="charts_show_ongoing_activity"
-            android:title="@string/show_ongoing_activity" />
+            android:title="@string/show_ongoing_activity"
+            app:iconSpaceReserved="false" />
 
         <EditTextPreference
             android:defaultValue="6"
@@ -63,13 +72,15 @@
             android:key="chart_sleep_lines_limit"
             android:maxLength="2"
             android:title="@string/pref_chart_sleep_lines_limit"
+            app:iconSpaceReserved="false"
             app:useSimpleSummaryProvider="true" />
 
     </PreferenceCategory>
 
     <PreferenceCategory
         android:key="pref_charts_activity_list"
-        android:title="@string/charts_activity_list">
+        android:title="@string/charts_activity_list"
+        app:iconSpaceReserved="false">
 
         <EditTextPreference
             android:defaultValue="5"
@@ -77,6 +88,7 @@
             android:key="chart_list_min_session_length"
             android:maxLength="2"
             android:title="@string/activity_prefs_chart_min_session_length"
+            app:iconSpaceReserved="false"
             app:useSimpleSummaryProvider="true" />
 
         <EditTextPreference
@@ -85,6 +97,7 @@
             android:key="chart_list_max_idle_phase_length"
             android:maxLength="2"
             android:title="@string/activity_prefs_chart_max_idle_phase_length"
+            app:iconSpaceReserved="false"
             app:useSimpleSummaryProvider="true" />
 
         <EditTextPreference
@@ -93,6 +106,7 @@
             android:key="chart_list_min_steps_per_minute"
             android:maxLength="3"
             android:title="@string/activity_prefs_chart_min_steps_per_minute"
+            app:iconSpaceReserved="false"
             app:useSimpleSummaryProvider="true" />
 
         <EditTextPreference
@@ -101,15 +115,18 @@
             android:key="chart_list_min_steps_per_minute_for_run"
             android:maxLength="3"
             android:title="@string/activity_prefs_chart_min_steps_per_minute_for_run"
+            app:iconSpaceReserved="false"
             app:useSimpleSummaryProvider="true" />
     </PreferenceCategory>
 
     <PreferenceCategory
         android:key="pref_category_activity_personal_title"
-        android:title="@string/activity_prefs_about_you">
+        android:title="@string/activity_prefs_about_you"
+        app:iconSpaceReserved="false">
 
         <Preference
             android:key="pref_category_activity_personal"
-            android:title="@string/activity_prefs_about_you" />
+            android:title="@string/activity_prefs_about_you"
+            app:iconSpaceReserved="false" />
     </PreferenceCategory>
 </PreferenceScreen>