diff --git a/app/build.gradle b/app/build.gradle
index 10184e3b..8d657dca 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -9,8 +9,8 @@ android {
         applicationId "com.cappielloantonio.playforsubsonic"
         minSdkVersion 26
         targetSdkVersion 31
-        versionCode 1
-        versionName "1.0"
+        versionCode 2
+        versionName "1.1"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index 72d42607..901e9f7e 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -11,32 +11,24 @@
     </string-array>
 
     <string-array name="pref_cache_size_titles">
-        <item>Unlimited</item>
-        <item>2GB</item>
-        <item>1GB</item>
-        <item>400MB</item>
-        <item>200MB</item>
+        <item>High</item>
+        <item>Medium</item>
+        <item>Low</item>
     </string-array>
     <string-array name="pref_cache_size_values">
         <item>4000000000</item>
-        <item>2000000000</item>
         <item>1000000000</item>
-        <item>400000000</item>
         <item>200000000</item>
     </string-array>
 
     <string-array name="pref_media_cache_size_titles">
-        <item>Unlimited</item>
-        <item>2GB</item>
-        <item>1GB</item>
-        <item>400MB</item>
-        <item>200MB</item>
+        <item>High</item>
+        <item>Medium</item>
+        <item>Low</item>
     </string-array>
     <string-array name="pref_media_cache_size_values">
         <item>4000000000</item>
-        <item>2000000000</item>
         <item>1000000000</item>
-        <item>400000000</item>
         <item>200000000</item>
     </string-array>
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 1b1945da..4304c4c5 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -46,7 +46,7 @@
     <string name="connection_alert_dialog_neutral_button">Enable data saver</string>
     <string name="connection_alert_dialog_positive_button">Continue anyway</string>
     <string name="connection_alert_dialog_title">Wi-Fi not connected</string>
-    <string name="connection_alert_dialog_summary">Access to the Subsonic server on connections other than WiFi has been restricted. To prevent this alert dialod from reappearing, disable the connection check in the app settings.</string>
+    <string name="connection_alert_dialog_summary">Access to the Subsonic server on connections other than Wi-Fi has been restricted. To prevent this alert dialod from reappearing, disable the connection check in the app settings.</string>
     <string name="download_info_empty_subtitle">Once you download a song, you\'ll find it here</string>
     <string name="download_info_empty_title">No downloads yet!</string>
     <string name="download_title_album_section">Albums</string>
@@ -151,30 +151,31 @@
     <string name="server_unreachable_dialog_summary">The requested server is unavailable. Please contact your support and describe your issue.</string>
     <string name="settings_about_summary">Play is an open source and lightweight music client for Subsonic, designed and built natively for Android.</string>
     <string name="settings_about_title">About</string>
-    <string name="settings_audio_transcode_format_mobile">Transcode format in Mobile</string>
-    <string name="settings_audio_transcode_format_wifi">Transcode format in WiFi</string>
-    <string name="settings_covers_cache">Covers cache</string>
-    <string name="settings_data_saving_mode_summary">Data saving mode summary</string>
-    <string name="settings_data_saving_mode_title">Data saving mode</string>
+    <string name="settings_audio_transcode_format_mobile">Transcode format in mobile</string>
+    <string name="settings_audio_transcode_format_wifi">Transcode format in Wi-Fi</string>
+    <string name="settings_covers_cache">Size of artwork cache</string>
+    <string name="settings_data_saving_mode_summary">In order to reduce data consumption, avoid downloading covers</string>
+    <string name="settings_data_saving_mode_title">Limit mobile data usage</string>
     <string name="settings_equalizer_summary">Adjust audio settings</string>
     <string name="settings_equalizer_title">Equalizer</string>
     <string name="settings_github_link">https://github.com/CappielloAntonio/play-for-subsonic</string>
     <string name="settings_github_summary">Follow the development</string>
     <string name="settings_github_title">Github</string>
-    <string name="settings_image_size">Cover size</string>
+    <string name="settings_image_size">Set max image resolution for resized artiwork</string>
     <string name="settings_logout_title">Log out</string>
-    <string name="settings_max_bitrate_wifi">Bitrate in WiFi</string>
+    <string name="settings_max_bitrate_wifi">Bitrate in Wi-Fi</string>
     <string name="settings_max_bitrate_mobile">Bitrate in mobile</string>
-    <string name="settings_media_cache">Media cache</string>
+    <string name="settings_media_cache">Size of media file cache</string>
     <string name="settings_scan_title">Scan library</string>
     <string name="settings_sync_starred_tracks_for_offline_use_summary">If enabled, starred tracks will be downloaded for offline use</string>
     <string name="settings_sync_starred_tracks_for_offline_use_title">Sync starred tracks for offline use</string>
-    <string name="settings_theme">Choose theme</string>
+    <string name="settings_theme">Theme</string>
+    <string name="settings_title_data">Data</string>
     <string name="settings_title_general">General</string>
-    <string name="settings_version_summary">1.0</string>
+    <string name="settings_version_summary">1.1</string>
     <string name="settings_version_title">Version</string>
-    <string name="settings_wifi_only_title">WiFi only</string>
-    <string name="settings_wifi_only_summary">Summary WiFi only</string>
+    <string name="settings_wifi_only_title">Stream via Wi-Fi only alert</string>
+    <string name="settings_wifi_only_summary">Ask for user confirmation before streaming over mobile network</string>
     <string name="song_bottom_sheet_add_to_playlist">Add to playlist</string>
     <string name="song_bottom_sheet_add_to_queue">Add to queue</string>
     <string name="song_bottom_sheet_download">Download</string>
@@ -199,4 +200,5 @@
     <string name="starred_sync_dialog_positive_button">Continue</string>
     <string name="starred_sync_dialog_summary">Tracks will be downloaded in their original format. Standard data rates may apply.</string>
     <string name="starred_sync_dialog_title">Sync starred tracks</string>
+    <string name="settings_title_transcoding">Transcoding</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/xml/global_preferences.xml b/app/src/main/res/xml/global_preferences.xml
index c5945d32..d77d1af6 100644
--- a/app/src/main/res/xml/global_preferences.xml
+++ b/app/src/main/res/xml/global_preferences.xml
@@ -2,7 +2,31 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
     <PreferenceCategory app:title="@string/settings_title_general">
         <ListPreference
-            app:defaultValue="400000000"
+            app:defaultValue="default"
+            app:dialogTitle="@string/settings_theme"
+            app:entries="@array/theme_list_titles"
+            app:entryValues="@array/theme_list_values"
+            app:key="theme"
+            app:title="@string/settings_theme"
+            app:useSimpleSummaryProvider="true" />
+
+        <Preference
+            android:key="equalizer"
+            android:title="@string/settings_equalizer_title"
+            android:summary="@string/settings_equalizer_summary" />
+
+        <Preference
+            android:key="scan_library"
+            android:title="@string/settings_scan_title" />
+
+        <Preference
+            android:key="logout"
+            android:title="@string/settings_logout_title"/>
+    </PreferenceCategory>
+
+    <PreferenceCategory app:title="@string/settings_title_data">
+        <ListPreference
+            app:defaultValue="200000000"
             app:dialogTitle="@string/settings_covers_cache"
             app:entries="@array/pref_cache_size_titles"
             app:entryValues="@array/pref_cache_size_values"
@@ -11,7 +35,7 @@
             app:useSimpleSummaryProvider="true" />
 
         <ListPreference
-            app:defaultValue="400000000"
+            app:defaultValue="200000000"
             app:dialogTitle="@string/settings_media_cache"
             app:entries="@array/pref_media_cache_size_titles"
             app:entryValues="@array/pref_media_cache_size_values"
@@ -28,15 +52,26 @@
             app:title="@string/settings_image_size"
             app:useSimpleSummaryProvider="true" />
 
-        <ListPreference
-            app:defaultValue="default"
-            app:dialogTitle="@string/settings_theme"
-            app:entries="@array/theme_list_titles"
-            app:entryValues="@array/theme_list_values"
-            app:key="theme"
-            app:title="@string/settings_theme"
-            app:useSimpleSummaryProvider="true" />
+        <SwitchPreference
+            android:title="@string/settings_sync_starred_tracks_for_offline_use_title"
+            android:defaultValue="false"
+            android:summary="@string/settings_sync_starred_tracks_for_offline_use_summary"
+            android:key="sync_starred_tracks_for_offline_use" />
 
+        <SwitchPreference
+            android:title="@string/settings_wifi_only_title"
+            android:defaultValue="false"
+            android:summary="@string/settings_wifi_only_summary"
+            android:key="wifi_only" />
+
+        <SwitchPreference
+            android:title="@string/settings_data_saving_mode_title"
+            android:defaultValue="false"
+            android:summary="@string/settings_data_saving_mode_summary"
+            android:key="data_saving_mode" />
+    </PreferenceCategory>
+
+    <PreferenceCategory app:title="@string/settings_title_transcoding">
         <ListPreference
             app:defaultValue="0"
             app:dialogTitle="@string/settings_max_bitrate_wifi"
@@ -72,37 +107,6 @@
             app:key="audio_transcode_format_mobile"
             app:title="@string/settings_audio_transcode_format_mobile"
             app:useSimpleSummaryProvider="true" />
-
-        <CheckBoxPreference
-            android:title="@string/settings_wifi_only_title"
-            android:defaultValue="false"
-            android:summary="@string/settings_wifi_only_summary"
-            android:key="wifi_only" />
-
-        <CheckBoxPreference
-            android:title="@string/settings_data_saving_mode_title"
-            android:defaultValue="false"
-            android:summary="@string/settings_data_saving_mode_summary"
-            android:key="data_saving_mode" />
-
-        <CheckBoxPreference
-            android:title="@string/settings_sync_starred_tracks_for_offline_use_title"
-            android:defaultValue="false"
-            android:summary="@string/settings_sync_starred_tracks_for_offline_use_summary"
-            android:key="sync_starred_tracks_for_offline_use" />
-
-        <Preference
-            android:key="equalizer"
-            android:title="@string/settings_equalizer_title"
-            android:summary="@string/settings_equalizer_summary" />
-
-        <Preference
-            android:key="scan_library"
-            android:title="@string/settings_scan_title" />
-
-        <Preference
-            android:key="logout"
-            android:title="@string/settings_logout_title"/>
     </PreferenceCategory>
 
     <PreferenceCategory app:title="@string/settings_about_title">