diff --git a/app/src/main/java/com/cappielloantonio/play/service/MultiPlayer.java b/app/src/main/java/com/cappielloantonio/play/service/MultiPlayer.java
index 71ad3f4e..4873d4f0 100644
--- a/app/src/main/java/com/cappielloantonio/play/service/MultiPlayer.java
+++ b/app/src/main/java/com/cappielloantonio/play/service/MultiPlayer.java
@@ -85,7 +85,7 @@ public class MultiPlayer implements Playback {
         @Override
         public void onPlayerError(ExoPlaybackException error) {
             Log.i(TAG, String.format("onPlayerError: %s", error.getMessage()));
-            Toast.makeText(context, context.getResources().getString(R.string.unplayable_file), Toast.LENGTH_SHORT).show();
+            Toast.makeText(context, context.getResources().getString(R.string.exo_info_unplayable_file), Toast.LENGTH_SHORT).show();
 
             exoPlayer.clearMediaItems();
             exoPlayer.prepare();
diff --git a/app/src/main/java/com/cappielloantonio/play/service/MusicService.java b/app/src/main/java/com/cappielloantonio/play/service/MusicService.java
index 2d548834..b97b221d 100644
--- a/app/src/main/java/com/cappielloantonio/play/service/MusicService.java
+++ b/app/src/main/java/com/cappielloantonio/play/service/MusicService.java
@@ -183,10 +183,10 @@ public class MusicService extends Service implements Playback.PlaybackCallbacks
                             if (!playlistSongs.isEmpty()) {
                                 openQueue(playlistSongs, 0, true);
                             } else {
-                                Toast.makeText(getApplicationContext(), R.string.playlist_is_empty, Toast.LENGTH_LONG).show();
+                                Toast.makeText(getApplicationContext(), R.string.exo_info_empty_playlist, Toast.LENGTH_LONG).show();
                             }
                         } else {
-                            Toast.makeText(getApplicationContext(), R.string.playlist_is_empty, Toast.LENGTH_LONG).show();
+                            Toast.makeText(getApplicationContext(), R.string.exo_info_empty_playlist, Toast.LENGTH_LONG).show();
                         }
                         break;
                     case ACTION_REWIND:
diff --git a/app/src/main/java/com/cappielloantonio/play/ui/activity/base/BaseActivity.java b/app/src/main/java/com/cappielloantonio/play/ui/activity/base/BaseActivity.java
index dd580d9d..e8aeb764 100644
--- a/app/src/main/java/com/cappielloantonio/play/ui/activity/base/BaseActivity.java
+++ b/app/src/main/java/com/cappielloantonio/play/ui/activity/base/BaseActivity.java
@@ -114,10 +114,10 @@ public class BaseActivity extends AppCompatActivity implements MusicServiceEvent
 
     private void showBatteryOptimizationDialog() {
         AlertDialog.Builder builder = new AlertDialog.Builder(this);
-        builder.setMessage(R.string.battery_optimizations_message)
-                .setTitle(R.string.battery_optimizations_title)
-                .setNegativeButton(R.string.ignore, null)
-                .setPositiveButton(R.string.disable, (dialog, id) -> openPowerSettings())
+        builder.setMessage(R.string.activity_battery_optimizations_summary)
+                .setTitle(R.string.activity_battery_optimizations_title)
+                .setNegativeButton(R.string.activity_negative_button, null)
+                .setPositiveButton(R.string.activity_neutral_button, (dialog, id) -> openPowerSettings())
                 .show();
     }
 
diff --git a/app/src/main/java/com/cappielloantonio/play/ui/notification/PlayingNotification.java b/app/src/main/java/com/cappielloantonio/play/ui/notification/PlayingNotification.java
index 95d93ec0..29197c25 100644
--- a/app/src/main/java/com/cappielloantonio/play/ui/notification/PlayingNotification.java
+++ b/app/src/main/java/com/cappielloantonio/play/ui/notification/PlayingNotification.java
@@ -90,9 +90,9 @@ public class PlayingNotification {
                             bitmap = BitmapFactory.decodeResource(service.getResources(), R.drawable.default_album_art);
                         }
 
-                        NotificationCompat.Action playPauseAction = new NotificationCompat.Action(playButtonResId, service.getString(R.string.action_play_pause), retrievePlaybackAction(ACTION_TOGGLE));
-                        NotificationCompat.Action previousAction = new NotificationCompat.Action(R.drawable.ic_skip_previous_white_24dp, service.getString(R.string.action_previous), retrievePlaybackAction(ACTION_REWIND));
-                        NotificationCompat.Action nextAction = new NotificationCompat.Action(R.drawable.ic_skip_next_white_24dp, service.getString(R.string.action_next), retrievePlaybackAction(ACTION_SKIP));
+                        NotificationCompat.Action playPauseAction = new NotificationCompat.Action(playButtonResId, service.getString(R.string.exo_action_play_pause), retrievePlaybackAction(ACTION_TOGGLE));
+                        NotificationCompat.Action previousAction = new NotificationCompat.Action(R.drawable.ic_skip_previous_white_24dp, service.getString(R.string.exo_action_previous), retrievePlaybackAction(ACTION_REWIND));
+                        NotificationCompat.Action nextAction = new NotificationCompat.Action(R.drawable.ic_skip_next_white_24dp, service.getString(R.string.exo_action_next), retrievePlaybackAction(ACTION_SKIP));
 
                         NotificationCompat.Builder builder = new NotificationCompat.Builder(service, NOTIFICATION_CHANNEL_ID)
                                 .setSmallIcon(R.drawable.ic_notification)
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index cc55f6ef..eecdf1b2 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,183 +1,174 @@
 <resources>
-    <string name="app_name">Play for Subsonic</string>
-
-    <string name="general_header">General</string>
-    <string name="search_hint">Search title, artists or albums</string>
-    <string name="theme_selection">Choose theme</string>
-    <string name="covers_cache">Covers cache</string>
-    <string name="media_cache">Media cache</string>
-    <string name="image_size">Cover size</string>
-    <string name="menu_library_label">Library</string>
-    <string name="menu_home_label">Home</string>
-    <string name="search_menu_label">Search</string>
-    <string name="menu_download_label">Download</string>
-    <string name="label_placeholder">--</string>
-    <string name="label_dot_separator">•</string>
-
-    <string name="about_header">About</string>
-    <string name="summary_about">Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</string>
-    <string name="app_version">1.0</string>
-    <string name="title_version">Version</string>
-    <string name="github_page">Github</string>
-    <string name="development">Follow the development</string>
-    <string name="github_url">https://github.com/CappielloAntonio/play-for-subsonic</string>
-
-    <string name="battery_optimizations_title">Battery Optimizations</string>
-    <string name="battery_optimizations_message">Please disable battery optimizations for media playback while the screen is off.</string>
-
-    <string name="disable">Disable</string>
-    <string name="ignore">Ignore</string>
-
-    <string name="unplayable_file">Couldn\'t play this song.</string>
-    <string name="playlist_is_empty">Playlist is empty</string>
-
-    <string name="action_play_pause">Play/Pause</string>
-    <string name="action_previous">Previous</string>
-    <string name="action_next">Next</string>
-
-    <string name="playing_notification_description">The playing notification provides actions for play/pause etc.</string>
-    <string name="playing_notification_name">Playing Notification</string>
-
-    <string name="exo_download_notification_channel_name">Downloads</string>
-    <string name="album_error_retrieving_radio">Error retrieving album\'s radio</string>
-    <string name="album_error_retrieving_artist">Error retrieving artist</string>
-    <string name="album_catalogue_title">Albums</string>
-    <string name="empty_string" />
-    <string name="album_list_page_recently_played">Recently played albums</string>
-    <string name="album_list_page_most_played">Most played albums</string>
-    <string name="album_list_page_recently_added">Recently added albums</string>
-    <string name="album_list_page_starred">Starred albums</string>
-    <string name="album_list_page_downloaded">Downloaded albums</string>
-    <string name="album_list_page_title">Albums</string>
-    <string name="artist_error_retrieving_radio">Error retrieving artist\'s radio</string>
-    <string name="artist_error_retrieving_tracks">Error retrieving artist\'s tracks</string>
-    <string name="artist_catalogue_title">Artists</string>
-    <string name="artist_list_page_starred">Starred artists</string>
-    <string name="artist_list_page_downloaded">Downloaded artists</string>
-    <string name="artist_list_page_title">Artists</string>
-    <string name="filter_info_selection">Select two or more filters</string>
-    <string name="filter_title">Filter</string>
-    <string name="genre_catalogue_title">Genre Catalogue</string>
-    <string name="login_title">Subsonic servers</string>
-    <string name="playlist_info_song_count">\"Song count: \"</string>
-    <string name="playlist_catalogue_title">Playlist Catalogue</string>
-    <string name="playlist_chooser_dialog_title">Add to a playlist</string>
-    <string name="playlist_chooser_dialog_neutral_button">Create</string>
-    <string name="playlist_chooser_dialog_negative_button">Cancel</string>
-    <string name="playlist_editor_dialog_title">Create playlist</string>
-    <string name="playlist_editor_dialog_positive_button">Save</string>
-    <string name="playlist_editor_dialog_neutral_button">Delete</string>
-    <string name="playlist_editor_dialog_negative_button">Cancel</string>
-    <string name="error_required">Required</string>
-    <string name="playlist_counted_tracks">\" tracks\"</string>
-    <string name="playlist_song_count">\"Song count: \"</string>
-    <string name="playlist_duration">\"Playlist duration: \"</string>
-    <string name="rating_dialog_title">Rate</string>
-    <string name="rating_dialog_negative_button">Cancel</string>
-    <string name="rating_dialog_positive_button">Save</string>
-    <string name="search_info_minimum_characters">Enter at least three characters</string>
-    <string name="server_signup_dialog_title">Add server</string>
-    <string name="server_signup_dialog_neutral_button">Delete</string>
-    <string name="server_signup_dialog_positive_button">Save</string>
-    <string name="server_signup_dialog_negative_button">Cancel</string>
-    <string name="song_bottom_sheet_error_retrieving_album">Error retrieving album</string>
-    <string name="song_bottom_sheet_error_retrieving_artist">Error retrieving artist</string>
-    <string name="song_list_page_recently_played">Recently played tracks</string>
-    <string name="song_list_page_most_played">Most played tracks</string>
-    <string name="song_list_page_recently_added">Recently added tracks</string>
-    <string name="song_list_page_all">: all tracks</string>
-    <string name="song_list_page_top">\'s top tracks</string>
-    <string name="song_list_page_year">\"Year \"</string>
-    <string name="song_list_page_starred">Starred tracks</string>
-    <string name="song_list_page_downloaded">Downloaded</string>
-    <string name="song_list_page_title">Songs</string>
+    <string name="activity_battery_optimizations_summary">Please disable battery optimizations for media playback while the screen is off.</string>
+    <string name="activity_battery_optimizations_title">Battery Optimizations</string>
     <string name="activity_info_offline_mode">Offline mode</string>
-    <string name="album_bottom_sheet_instant_mix">Instant mix</string>
-    <string name="album_bottom_sheet_shuffle">Shuffle</string>
-    <string name="album_bottom_sheet_play_next">Play next</string>
+    <string name="activity_negative_button">Ignore</string>
+    <string name="activity_neutral_button">Disable</string>
     <string name="album_bottom_sheet_add_to_queue">Add to queue</string>
     <string name="album_bottom_sheet_download_all">Download all</string>
-    <string name="album_bottom_sheet_remove_all">Remove all</string>
     <string name="album_bottom_sheet_go_to_artist">Go to artist</string>
-    <string name="artist_bottom_sheet_instant_mix">Instant mix</string>
-    <string name="artist_bottom_sheet_shuffle">Shuffle</string>
-    <string name="song_bottom_sheet_instant_mix">Instant mix</string>
-    <string name="song_bottom_sheet_play_next">Play next</string>
-    <string name="song_bottom_sheet_add_to_queue">Add to queue</string>
-    <string name="song_bottom_sheet_rate">Rate</string>
-    <string name="song_bottom_sheet_download">Download</string>
-    <string name="song_bottom_sheet_remove">Remove</string>
-    <string name="song_bottom_sheet_add_to_playlist">Add to playlist</string>
-    <string name="song_bottom_sheet_go_to_album">Go to album</string>
-    <string name="song_bottom_sheet_go_to_artist">Go to artist</string>
-    <string name="playlist_chooser_dialog_empty">No playlists created</string>
-    <string name="playlist_editor_dialog_hint_name">Playlist Name</string>
-    <string name="server_signup_dialog_hint_name">Server Name</string>
-    <string name="server_signup_dialog_hint_username">Username</string>
-    <string name="server_signup_dialog_hint_password">Password</string>
-    <string name="server_signup_dialog_hint_url">Server URL</string>
-    <string name="server_signup_dialog_action_direct_access">Direct access</string>
+    <string name="album_bottom_sheet_instant_mix">Instant mix</string>
+    <string name="album_bottom_sheet_play_next">Play next</string>
+    <string name="album_bottom_sheet_remove_all">Remove all</string>
+    <string name="album_bottom_sheet_shuffle">Shuffle</string>
+    <string name="album_catalogue_title">Albums</string>
     <string name="album_catalogue_title_expanded">Browse Albums</string>
+    <string name="album_error_retrieving_artist">Error retrieving artist</string>
+    <string name="album_error_retrieving_radio">Error retrieving album\'s radio</string>
+    <string name="album_list_page_downloaded">Downloaded albums</string>
+    <string name="album_list_page_most_played">Most played albums</string>
+    <string name="album_list_page_recently_added">Recently added albums</string>
+    <string name="album_list_page_recently_played">Recently played albums</string>
+    <string name="album_list_page_starred">Starred albums</string>
+    <string name="album_list_page_title">Albums</string>
+    <string name="album_page_extra_info_button">More like this</string>
     <string name="album_page_play_button">Play</string>
     <string name="album_page_shuffle_button">Shuffle</string>
-    <string name="album_page_extra_info_button">More like this</string>
+    <string name="app_name">Play for Subsonic</string>
+    <string name="artist_bottom_sheet_instant_mix">Instant mix</string>
+    <string name="artist_bottom_sheet_shuffle">Shuffle</string>
+    <string name="artist_catalogue_title">Artists</string>
     <string name="artist_catalogue_title_expanded">Browse Artists</string>
-    <string name="artist_page_shuffle_button">Shuffle</string>
+    <string name="artist_error_retrieving_radio">Error retrieving artist\'s radio</string>
+    <string name="artist_error_retrieving_tracks">Error retrieving artist\'s tracks</string>
+    <string name="artist_list_page_downloaded">Downloaded artists</string>
+    <string name="artist_list_page_starred">Starred artists</string>
+    <string name="artist_list_page_title">Artists</string>
     <string name="artist_page_radio_button">Radio</string>
-    <string name="artist_page_title_biography_section">Biography</string>
+    <string name="artist_page_shuffle_button">Shuffle</string>
+    <string name="artist_page_title_album_more_like_this_button">More like this</string>
+    <string name="artist_page_title_album_section">Albums</string>
     <string name="artist_page_title_biography_more_button">More</string>
+    <string name="artist_page_title_biography_section">Biography</string>
     <string name="artist_page_title_most_streamed_song_section">Most Streamed Songs</string>
     <string name="artist_page_title_most_streamed_song_see_all_button">See all</string>
-    <string name="artist_page_title_album_section">Albums</string>
-    <string name="artist_page_title_album_more_like_this_button">More like this</string>
-    <string name="download_info_empty_title">No downloads yet!</string>
     <string name="download_info_empty_subtitle">Once you download a song, you\'ll find it here</string>
-    <string name="download_title_artist_section">Artists</string>
-    <string name="download_title_artist_see_all_button">See all</string>
+    <string name="download_info_empty_title">No downloads yet!</string>
     <string name="download_title_album_section">Albums</string>
     <string name="download_title_album_see_all">See all</string>
-    <string name="download_title_tracks_section">Tracks</string>
-    <string name="download_title_tracks_see_all_button">See all</string>
+    <string name="download_title_artist_section">Artists</string>
+    <string name="download_title_artist_see_all_button">See all</string>
     <string name="download_title_playlist_section">Playlists</string>
     <string name="download_title_playlist_see_all_button">See all</string>
+    <string name="download_title_tracks_section">Tracks</string>
+    <string name="download_title_tracks_see_all_button">See all</string>
+    <string name="empty_string" />
+    <string name="error_required">Required</string>
+    <string name="exo_action_next">Next</string>
+    <string name="exo_action_play_pause">Play/Pause</string>
+    <string name="exo_action_previous">Previous</string>
+    <string name="exo_download_notification_channel_name">Downloads</string>
+    <string name="exo_info_empty_playlist">Playlist is empty</string>
+    <string name="exo_info_unplayable_file">Couldn\'t play this song.</string>
+    <string name="filter_info_selection">Select two or more filters</string>
+    <string name="filter_title">Filter</string>
     <string name="filter_title_expanded">Filter Genres</string>
+    <string name="genre_catalogue_title">Genre Catalogue</string>
     <string name="genre_catalogue_title_expanded">Browse Genres</string>
-    <string name="home_title_music_discovery">Music discovery</string>
     <string name="home_subtitle_made_for_you">Start mix from a song you liked</string>
+    <string name="home_title_flashback">Flashback</string>
+    <string name="home_title_last_played">Last played</string>
+    <string name="home_title_last_played_see_all_button">See all</string>
     <string name="home_title_made_for_you">Made for you</string>
     <string name="home_title_most_played">Most played</string>
     <string name="home_title_most_played_see_all_button">See all</string>
-    <string name="home_title_last_played">Last played</string>
-    <string name="home_title_last_played_see_all_button">See all</string>
-    <string name="home_title_flashback">Flashback</string>
-    <string name="home_title_starred_tracks">★ Starred tracks</string>
-    <string name="home_title_starred_tracks_see_all_button">See all</string>
+    <string name="home_title_music_discovery">Music discovery</string>
+    <string name="home_title_recently_added">Recently added</string>
+    <string name="home_title_recently_added_see_all_button">See all</string>
     <string name="home_title_starred_albums">★ Starred albums</string>
     <string name="home_title_starred_albums_see_all_button">See all</string>
     <string name="home_title_starred_artists">★ Starred artists</string>
     <string name="home_title_starred_artists_see_all_button">See all</string>
-    <string name="home_title_recently_added">Recently added</string>
-    <string name="home_title_recently_added_see_all_button">See all</string>
-    <string name="library_title_new_releases">New releases</string>
+    <string name="home_title_starred_tracks">★ Starred tracks</string>
+    <string name="home_title_starred_tracks_see_all_button">See all</string>
+    <string name="label_dot_separator">•</string>
+    <string name="label_placeholder">--</string>
     <string name="library_title_album">Albums</string>
     <string name="library_title_album_see_all_button">See all</string>
     <string name="library_title_artist">Artists</string>
     <string name="library_title_artist_see_all_button">See all</string>
     <string name="library_title_genre">Genres</string>
     <string name="library_title_genre_see_all_button">See all</string>
+    <string name="library_title_new_releases">New releases</string>
     <string name="library_title_playlist">Playlists</string>
     <string name="library_title_playlist_see_all_button">See all</string>
-    <string name="login_title_expanded">Subsonic servers</string>
     <string name="login_empty">No server added</string>
+    <string name="login_title">Subsonic servers</string>
+    <string name="login_title_expanded">Subsonic servers</string>
+    <string name="menu_add_button">Add</string>
+    <string name="menu_download_all_button">Download all</string>
+    <string name="menu_download_label">Download</string>
+    <string name="menu_home_label">Home</string>
+    <string name="menu_library_label">Library</string>
+    <string name="menu_search_button">Search</string>
+    <string name="player_bottom_sheet_title">Now playing</string>
+    <string name="playing_notification_description">The playing notification provides actions for play/pause etc.</string>
+    <string name="playing_notification_name">Playing Notification</string>
+    <string name="playlist_catalogue_title">Playlist Catalogue</string>
     <string name="playlist_catalogue_title_expanded">Browse Playlists</string>
+    <string name="playlist_chooser_dialog_empty">No playlists created</string>
+    <string name="playlist_chooser_dialog_negative_button">Cancel</string>
+    <string name="playlist_chooser_dialog_neutral_button">Create</string>
+    <string name="playlist_chooser_dialog_title">Add to a playlist</string>
+    <string name="playlist_counted_tracks">\" tracks\"</string>
+    <string name="playlist_duration">\"Playlist duration: \"</string>
+    <string name="playlist_editor_dialog_hint_name">Playlist Name</string>
+    <string name="playlist_editor_dialog_negative_button">Cancel</string>
+    <string name="playlist_editor_dialog_neutral_button">Delete</string>
+    <string name="playlist_editor_dialog_positive_button">Save</string>
+    <string name="playlist_editor_dialog_title">Create playlist</string>
+    <string name="playlist_info_song_count">\"Song count: \"</string>
     <string name="playlist_page_play_button">Play</string>
     <string name="playlist_page_shuffle_button">Shuffle</string>
-    <string name="search_title_song">Songs</string>
+    <string name="playlist_song_count">\"Song count: \"</string>
+    <string name="rating_dialog_negative_button">Cancel</string>
+    <string name="rating_dialog_positive_button">Save</string>
+    <string name="rating_dialog_title">Rate</string>
+    <string name="search_hint">Search title, artists or albums</string>
+    <string name="search_info_minimum_characters">Enter at least three characters</string>
     <string name="search_title_album">Albums</string>
     <string name="search_title_artist">Artists</string>
-    <string name="player_bottom_sheet_title">Now playing</string>
-    <string name="menu_download_all_button">Download all</string>
-    <string name="menu_add_button">Add</string>
-    <string name="menu_search_button">Search</string>
+    <string name="search_title_song">Songs</string>
+    <string name="server_signup_dialog_action_direct_access">Direct access</string>
+    <string name="server_signup_dialog_hint_name">Server Name</string>
+    <string name="server_signup_dialog_hint_password">Password</string>
+    <string name="server_signup_dialog_hint_url">Server URL</string>
+    <string name="server_signup_dialog_hint_username">Username</string>
+    <string name="server_signup_dialog_negative_button">Cancel</string>
+    <string name="server_signup_dialog_neutral_button">Delete</string>
+    <string name="server_signup_dialog_positive_button">Save</string>
+    <string name="server_signup_dialog_title">Add server</string>
+    <string name="settings_about_summary">Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</string>
+    <string name="settings_about_title">About</string>
+    <string name="settings_covers_cache">Covers cache</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_media_cache">Media cache</string>
+    <string name="settings_theme">Choose theme</string>
+    <string name="settings_title_general">General</string>
+    <string name="settings_version_summary">1.0</string>
+    <string name="settings_version_title">Version</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>
+    <string name="song_bottom_sheet_error_retrieving_album">Error retrieving album</string>
+    <string name="song_bottom_sheet_error_retrieving_artist">Error retrieving artist</string>
+    <string name="song_bottom_sheet_go_to_album">Go to album</string>
+    <string name="song_bottom_sheet_go_to_artist">Go to artist</string>
+    <string name="song_bottom_sheet_instant_mix">Instant mix</string>
+    <string name="song_bottom_sheet_play_next">Play next</string>
+    <string name="song_bottom_sheet_rate">Rate</string>
+    <string name="song_bottom_sheet_remove">Remove</string>
+    <string name="song_list_page_all">: all tracks</string>
+    <string name="song_list_page_downloaded">Downloaded</string>
+    <string name="song_list_page_most_played">Most played tracks</string>
+    <string name="song_list_page_recently_added">Recently added tracks</string>
+    <string name="song_list_page_recently_played">Recently played tracks</string>
+    <string name="song_list_page_starred">Starred tracks</string>
+    <string name="song_list_page_title">Songs</string>
+    <string name="song_list_page_top">\'s top tracks</string>
+    <string name="song_list_page_year">\"Year \"</string>
     <string name="menu_settings_button">Settings</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 30cba9da..912a2998 100644
--- a/app/src/main/res/xml/global_preferences.xml
+++ b/app/src/main/res/xml/global_preferences.xml
@@ -1,40 +1,40 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
-    <PreferenceCategory app:title="@string/general_header">
+    <PreferenceCategory app:title="@string/settings_title_general">
         <ListPreference
             app:defaultValue="400000000"
-            app:dialogTitle="@string/covers_cache"
+            app:dialogTitle="@string/settings_covers_cache"
             app:entries="@array/pref_cache_size_titles"
             app:entryValues="@array/pref_cache_size_values"
             app:key="image_cache_size"
-            app:title="@string/covers_cache"
+            app:title="@string/settings_covers_cache"
             app:useSimpleSummaryProvider="true" />
 
         <ListPreference
             app:defaultValue="400000000"
-            app:dialogTitle="@string/media_cache"
+            app:dialogTitle="@string/settings_media_cache"
             app:entries="@array/pref_media_cache_size_titles"
             app:entryValues="@array/pref_media_cache_size_values"
             app:key="media_cache_size"
-            app:title="@string/media_cache"
+            app:title="@string/settings_media_cache"
             app:useSimpleSummaryProvider="true" />
 
         <ListPreference
             app:defaultValue="-1"
-            app:dialogTitle="@string/image_size"
+            app:dialogTitle="@string/settings_image_size"
             app:entries="@array/pref_image_size_titles"
             app:entryValues="@array/pref_image_size_values"
             app:key="image_size"
-            app:title="@string/image_size"
+            app:title="@string/settings_image_size"
             app:useSimpleSummaryProvider="true" />
 
         <ListPreference
             app:defaultValue="default"
-            app:dialogTitle="@string/theme_selection"
+            app:dialogTitle="@string/settings_theme"
             app:entries="@array/themeListArray"
             app:entryValues="@array/themeEntryArray"
             app:key="themePref"
-            app:title="@string/theme_selection"
+            app:title="@string/settings_theme"
             app:useSimpleSummaryProvider="true" />
 
         <Preference
@@ -52,22 +52,22 @@
         
     </PreferenceCategory>
 
-    <PreferenceCategory app:title="@string/about_header">
+    <PreferenceCategory app:title="@string/settings_about_title">
         <Preference
             app:selectable="false"
-            app:summary="@string/summary_about" />
+            app:summary="@string/settings_about_summary" />
 
         <Preference
-            app:summary="@string/app_version"
-            app:title="@string/title_version" />
+            app:summary="@string/settings_version_summary"
+            app:title="@string/settings_version_title" />
 
         <!-- preference opens url in browser -->
         <Preference
-            app:summary="@string/development"
-            app:title="@string/github_page">
+            app:summary="@string/settings_github_summary"
+            app:title="@string/settings_github_title">
             <intent
                 android:action="android.intent.action.VIEW"
-                android:data="@string/github_url" />
+                android:data="@string/settings_github_link" />
         </Preference>
 
     </PreferenceCategory>